manage-client 3.2.180 → 3.2.181

package/src/filiale/qianneng/exportConfig.js

@@ -9,6 +9,28 @@ export default{
     'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费', 'overdue': '违约金', 'f_garbage_fee': '附加费',
     'f_balance': '上期余额', 'f_oughtfee_all': '合计欠费', 'f_comments': '备注'
   },
+  compreConfig: {
+    'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
+    'f_province':'省','f_city':'市','f_district':'区/县',
+    'f_residential_area': '小区名称', 'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号', 'f_address': '客户地址','f_iscity':'地区类型', 'f_user_phone': '客户电话', 'f_usetype': '使用类型',
+    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '气表类型', 'f_meter_brand': '气表品牌',
+    'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '左右表', 'f_install_date': '安装日期', 'f_meter_base': '气表底数',
+    'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
+    'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',
+    'f_open_date': '开户时间', 'f_credentials': '证件类型', 'f_idnumber': '证件号码', 'f_people_num': '人口数', 'f_ins_stop_date': '保险结束日期',
+    'f_createfile_date': '建档日期', 'f_createfile_person': '建档人', 'f_depname': '所属营业厅', 'f_comments': '备注信息',
+    'f_used_name': '曾用名', 'f_rent_phone': '备用电话', 'f_rent_name': '租户姓名', 'f_zuhu_phone': '租户电话',
+    'f_contract_id': '发票编码', 'f_is_mgq': '是否煤改气', 'f_send_usegas_card': '是否发放天然气使用证',
+    'f_meter_style': '气表型号', 'f_table_state': '表状态', 'f_initial_base': '初始气表底数',
+    'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额', 'f_inputtor': '档案抄表员',
+    'f_book_inputtor': '表册抄表员',
+    'f_userfiles_address': '安装地址', 'f_install_person': '安装人', 'f_gas_person': '通气人',
+    'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序',
+    'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
+    'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
+    , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
+    'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控'
+  },
   chargeConfig: {
     'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
     'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',

package/src/filiale/qianneng/sale.js

@@ -9,7 +9,9 @@ let specialComp = {
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
   // 用户查询
   'user-query': (resolve) => { require(['./UserQuery'], resolve) },
-  'business-manage': (resolve) => { require(['./BusinessManage'], resolve) }
+  'business-manage': (resolve) => { require(['./BusinessManage'], resolve) },
+  //综合档案信息查询
+  'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -908,7 +908,7 @@
         selected:{},
         meterbooks:[{label: '全部',value: ''}],  //抄表册
         inputtores:[{label: '全部',value: ''}],
-        writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'}],
+        writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'},{label: '写卡失败',value: '写卡失败'}],
         bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
         allorgid:[],
         tempfalg :false,

package/src/filiale/zhongyi/FillCardQuery.vue

@@ -0,0 +1,581 @@
+<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 @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">
+                <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" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " 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="fillCardQuery" 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_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.f_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">小&emsp;&emsp;区</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">补卡类型</label>
+                  <v-select :value.sync="model.f_type"
+                            v-model="model.f_type"
+                            :value-single="true"
+                            :options='$parent.$parent.fillCardTypes' placeholder='请选择'
+                            condition=" f_type = '{}'"
+                            close-on-select  clear-button></v-select>
+                </div>
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id like '%{}%'" placeholder='卡号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div 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 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 flex-row" style="white-space: nowrap" >
+                  <label  class="font_normal_body">卡费</label>
+                  <div class="row">
+                    <input type="text" style="width:30%" class="input_search" v-model="model.f_cardfeesmin"
+                           condition="f_cardfees >= {} " placeholder="">
+                    <label   class="font_normal_body">  ≤ x ≤ </label>
+                    <input type="text" style="width:30%" class="input_search" v-model="model.f_cardfeesmax"
+                           condition="f_cardfees <= {} " placeholder="">
+                  </div>
+                </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>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                </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>
+                </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>-->
+                  <data-order field="f_operate_date" name="补卡日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                </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_olduserinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_card_id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row. f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row. f_fill_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_cardfees}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</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>
+            </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_cardfees}}
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="flex" 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" 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>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import defaultPrint from '../../components/sale/config/DefaultPrint'
+  import exportConfig from './exportConfig'
+
+  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 {
+    props:['data'],
+    title: '补卡查询',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0}),
+        criteriaShow: false,
+        headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司","付款方式"],
+        bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname","f_payment"],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_idnumber', 'f_card_id', 'f_meter_brand', 'f_operate_date', 'f_cardfees', 'f_operator']
+        },
+        f_cardfeesmin:0,
+        f_cardfeesmax:0,
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        //默认打印列
+        defaultfield: [],
+        orgCondtionStr: '',
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        showupload:false,
+        selected:{},
+        //小区
+        residentialArea: [],
+        meterbrands: [],
+        // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
+
+        show:false,
+        rowdata:{},
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      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);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      async selfSearch(args) {
+        console.log("--------------------?")
+        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
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
+       await this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+
+      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]
+      },
+      async  getaddress(){
+        console.log('开始获取小区')
+        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){
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
+        this.$refs.paged.$refs.cri.$refs.sel.slice_area = []
+        //部门和人员变为全选
+        // this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        // this.$refs.paged.$refs.cri.$refs.sel.$children[3].$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(condition) {
+        this.orgCondtionStr = condition
+      },
+      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)
+      },
+      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()
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+    },
+    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
+      },
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          this.updateParams()
+        }
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
+        }
+      },
+      getfield() {
+        return exportConfig.fillcardConfig
+      },
+      fillCardTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('补卡类型')]
+      },
+      chargeState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('补卡状态')]
+      },
+      payments() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      }
+    }
+  }
+</script>

package/src/filiale/zhongyi/GasStatistics.vue

@@ -148,6 +148,22 @@
                               :show-reset-button="reset">
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气类型</label>
+                  <v-select :value.sync="model.f_user_nature"
+                            v-model="model.f_user_nature"
+                            :options="$parent.$parent.usernatures"
+                            condition="ss.f_user_nature = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties"
+                            v-model="model.f_gasproperties"
+                            :options="$parent.$parent.gasProperties"
+                            condition="ss.f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -463,6 +479,12 @@
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
+      usernatures(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
+      gasProperties(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
       gasState() {
         return [{label:'正常', value:'正常'},
           {label:'异常', value:'异常'},