manage-client 3.2.87 → 3.2.88

package/src/components/sale/filesquery/FireQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" class="flex" v-if="!show">
-          <criteria-paged :model="model" v-ref:paged>
+          <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">
@@ -115,11 +115,17 @@
             <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
               <template partial='head'>
                 <tr>
-                  <th><nobr>客户编号</nobr></th>
+                  <th>
+                    <!--<nobr>客户编号</nobr>-->
+                    <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  </th>
                   <th><nobr>客户名称</nobr></th>
                   <th><nobr>档案编号</nobr></th>
                   <th><nobr>客户电话</nobr></th>
-                  <th><nobr>客户地址</nobr></th>
+                  <th>
+                    <!--<nobr>客户地址</nobr>-->
+                    <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  </th>
                   <th><nobr>客户状态</nobr></th>
 
                   <th><nobr>表号</nobr></th>
@@ -163,9 +169,15 @@
                   <th v-if="$parent.$parent.$parent.usertype!='民用'"><nobr>探测器数量</nobr></th>
                   <!--公共-->
                   <th><nobr>设施检验结论</nobr></th>
-                  <th><nobr>交付日期</nobr></th>
+                  <th>
+                    <!--<nobr>交付日期</nobr>-->
+                    <data-order field="f_deliver_date" name="交付日期" :order.sync="$parent.$parent.$parent.orderFields.f_deliver_date"></data-order>
+                  </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>
                 </tr>
               </template>
               <template partial='body'>
@@ -288,13 +300,18 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fireQuery', 20),
+        model: new PagedList('rs/sql/fireQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'id desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'id desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         defaultfield: [],
@@ -432,6 +449,24 @@
         })
         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()
       }
     },
     watch:{
@@ -458,7 +493,7 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition(){
-        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr,orderitem:this.orderitem}
       },
       getfield(){
         let data = {}

package/src/components/sale/filesquery/MeterQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" class="flex" v-if="!show">
-          <criteria-paged :model="model" v-ref:paged>
+          <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">
@@ -253,7 +253,8 @@
               <template partial='head'>
                 <tr>
                   <th>
-                    <nobr>客户编号</nobr>
+                    <!--<nobr>客户编号</nobr>-->
+                    <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                   </th>
                   <th>
                     <nobr>客户名称</nobr>
@@ -271,7 +272,8 @@
                     <nobr>身份证号</nobr>
                   </th>
                   <th>
-                    <nobr>客户地址</nobr>
+                    <!--<nobr>客户地址</nobr>-->
+                    <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                   </th>
                   <th>
                     <nobr>表册片区</nobr>
@@ -315,10 +317,12 @@
                     <nobr>通气人</nobr>
                   </th>
                   <th>
-                    <nobr>通气时间</nobr>
+                    <!--<nobr>通气时间</nobr>-->
+                    <data-order field="f_gas_date" name="通气时间" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>
-                    <nobr>建表时间</nobr>
+                    <!--<nobr>建表时间</nobr>-->
+                    <data-order field="f_input_date" name="建表时间" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
                   </th>
                   <th>
                     <nobr>气表状态</nobr>
@@ -506,7 +510,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_user_id,f_table_state desc'`}, {f_balance_amount: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -514,6 +518,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_user_id,f_table_state desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
         thead: '',
         tfoot: '',
         initres: {
@@ -760,6 +769,24 @@
           })
         }
       },
+      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()
+      }
     },
     watch: {
       'model.rows.length' () {
@@ -809,7 +836,7 @@
           }
           this.updateParams()
         }
-      },
+      }
     },
     computed: {
       authArr () {
@@ -845,7 +872,7 @@
         }
       },
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
       },
       getfield() {
         let data = {}

package/src/components/sale/filesquery/PriceChangeQuery.vue

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row" class="foot_tabset"  @keyup.enter="search">
     <div class="basic-main">
       <div class="flex" v-if="!show">
-        <criteria-paged :model="model" v-ref:paged>
+        <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">
@@ -46,12 +46,12 @@
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
                                 :header="$parent.$parent.other"
-                                v-if="$parent.$parent.authArr.includes('档案查询导出')"
-                                sqlurl="rs/logic/exportfile" sql-name="changeuserquery" template-name='档案变更导出'
+                                v-if="$parent.$parent.authArr.includes('调价记录查询导出')"
+                                sqlurl="rs/logic/exportfile" sql-name="pricechangequery" 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="档案变更"
+                              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>
@@ -94,7 +94,8 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>客户编号</nobr>
+                  <!--<nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -115,7 +116,8 @@
                   <nobr>操作人</nobr>
                 </th>
                 <th>
-                  <nobr>操作日期</nobr>
+                  <!--<nobr>操作日期</nobr>-->
+                  <data-order field="f_operate_date" name="操作日期" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
                 <th>
                   <nobr>部门</nobr>
@@ -192,13 +194,18 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/pricechangequery', 20),
+        model: new PagedList('rs/sql/pricechangequery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -227,7 +234,7 @@
       getPricenames() {
           this.price = []
           let priceArr = []
-        debugger
+        //debugger
             this.$MagGetSaleParam.prices.forEach((item) => {
               let temp = {}
               temp.label = item.f_price_name
@@ -330,6 +337,24 @@
         })
         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()
       }
     },
     watch: {
@@ -356,7 +381,7 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
       },
       getfield() {
         return exportConfig.changUserConfig

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -444,7 +444,10 @@
               <template partial='head'>
                 <tr>
                   <th><nobr>客户状态</nobr></th>
-                  <th><nobr>客户编号</nobr></th>
+                  <th>
+                    <!--<nobr>客户编号</nobr>-->
+                    <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  </th>
                   <th><nobr>档案编号</nobr></th>
                   <th><nobr>是否发卡</nobr></th>
                   <th><nobr>卡号</nobr></th>
@@ -460,7 +463,10 @@
                   </th>
                   <th><nobr>客户电话</nobr></th>
                   <th><nobr>表册片区</nobr></th>
-                  <th><nobr>通气日期</nobr></th>
+                  <th>
+                    <!--<nobr>通气日期</nobr>-->
+                    <data-order field="f_gas_date" name="通气日期" :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
+                  </th>
                   <!-- 气价类型,单价暂时未处理 -->
                   <th><nobr>气价类型</nobr></th>
                   <th><nobr>气价名称</nobr></th>
@@ -473,10 +479,16 @@
                   <th><nobr>表号</nobr></th>
                   <th><nobr>表封号</nobr></th>
                   <th><nobr>左右表</nobr></th>
-                  <th><nobr>气表安装日期</nobr></th>
+                  <th>
+                    <!--<nobr>气表安装日期</nobr>-->
+                    <data-order field="f_install_date" name="气表安装日期" :order.sync="$parent.$parent.$parent.orderFields.f_install_date"></data-order>
+                  </th>
                   <th><nobr>气表底数</nobr></th>
                   <th><nobr>账户余额</nobr></th>
-                  <th><nobr>最后抄表日期</nobr></th>
+                  <th>
+                    <!--<nobr>最后抄表日期</nobr>-->
+                    <data-order field="f_hand_date" name="最后抄表日期" :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
+                  </th>
                   <!--<th><nobr>最后购气日期</nobr></th>-->
 
                   <th><nobr>阀门状态</nobr></th>
@@ -484,12 +496,22 @@
                   <!--                  <th><nobr>旧客户编号</nobr></th> -->
                   <th><nobr>客户类型</nobr></th>
                   <th><nobr>用气性质</nobr></th>
-                  <th><nobr>开户时间</nobr></th>
+                  <th>
+                    <!--<nobr>开户时间</nobr>-->
+                    <data-order field="f_open_date" name="开户时间" :order.sync="$parent.$parent.$parent.orderFields.f_open_date"></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>-->
+                    <data-order field="f_ins_stop_date" name="保险结束日期" :order.sync="$parent.$parent.$parent.orderFields.f_ins_stop_date"></data-order>
+                  </th>
+                  <th>
+                    <!--<nobr>建档日期</nobr>-->
+                    <data-order field="f_createfile_date" name="建档日期" :order.sync="$parent.$parent.$parent.orderFields.f_createfile_date"></data-order>
+                  </th>
                   <th><nobr>建档人</nobr></th>
                   <th><nobr>所属营业厅</nobr></th>
                   <th><nobr>备注信息</nobr></th>
@@ -553,7 +575,8 @@
                     <nobr>报警器编号</nobr>
                   </th>
                   <th>
-                    <nobr>换表时间</nobr>
+                    <!--<nobr>换表时间</nobr>-->
+                    <data-order field="f_maxdate" name="换表时间" :order.sync="$parent.$parent.$parent.orderFields.f_maxdate"></data-order>
                   </th>
                   <th>
                     <nobr>灶具信息</nobr>
@@ -574,10 +597,10 @@
                 <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_building}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_unit}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></td>
@@ -767,7 +790,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/compreQuery', 20,{items: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
+        model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
         criteriaShow: false,
         orgCondtionStr:'',
         residentialArea: [],
@@ -782,12 +805,7 @@
         tfoot: '',
         defaultfield: [],
         //排序
-        orderitem: 'f_residential_area',
-        orderitem1: 'f_unit',
-        orderitem2: 'f_building',
-        orderitem3: 'f_floor',
-        orderitem4: 'f_room',
-
+        orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
         orderFields: {
           f_operate_date: 'no'
         },
@@ -924,8 +942,7 @@
           //查询多个抄表员时条件
           args.condition += ` and f_inputtor in  ( ${str} )`
         }
-        //
-        debugger
+        //debugger
         this.bookinputtorperson = this.$refs.paged.$refs.cri.model.f_book_inputtor;
         if(this.bookinputtorperson.length !== 0){
           let str = JSON.stringify(this.bookinputtorperson)
@@ -1082,20 +1099,20 @@
           this.initmeterbook();
         }
       },
-        sort (field, rule) {
+      sort (field, rule) {
         // 将所有排序方式设为不排序，实现相互排斥
-        // for (let key in this.orderFields) {
-        //   if (key === field) {
-        //     this.orderFields[key] = rule
-        //   } else {
-        //     this.orderFields[key] = 'no'
-        //   }
-        // }
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
         // 如果新规则不排序，还原为默认排序
-        if (rule === 'no'|| rule === 'desc') {
-          this.model.paramSource.items= `'${this.orderitem} desc,${this.orderitem2} desc,${this.orderitem1} desc,${this.orderitem3} desc,${this.orderitem4} desc'`
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
         } else {
-          this.model.paramSource.items= `'${this.orderitem},${this.orderitem2},${this.orderitem1},${this.orderitem3},${this.orderitem4} ${rule}'`
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
         }
 
         this.search()
@@ -1243,7 +1260,7 @@
       },
       getCondition(){
 
-        return {condition:this.conditon2}
+        return {condition:this.conditon2,orderitem:this.orderitem}
       },
       getfield(){
         let data = {}

package/src/components/sale/filesquery/UserDeviceQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" class="flex" v-if="!show">
-          <criteria-paged :model="model" v-ref:paged>
+          <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">
@@ -48,7 +48,7 @@
                                   :field="$parent.$parent.getExportField"
                                   :header="$parent.$parent.other"
                                   :footer="$parent.$parent.footer"
-                                  v-if="$parent.$parent.authArr.includes('档案查询导出')"
+                                  v-if="$parent.$parent.authArr.includes('用户设备查询导出')"
                                   sqlurl="rs/logic/exportfile"
                                   sql-name="userDeviceQuery"
                                   template-name='用户设备查询导出'  :choose-col="true"></export-excel>
@@ -131,7 +131,10 @@
             <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
               <template partial='head'>
                 <tr>
-                  <th><nobr>客户编号</nobr></th>
+                  <th>
+                    <!--<nobr>客户编号</nobr>-->
+                    <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  </th>
                   <th><nobr>客户名称</nobr></th>
                   <th><nobr>档案编号</nobr></th>
                   <th><nobr>用户性质</nobr></th>
@@ -140,7 +143,10 @@
                   <th><nobr>设备型号</nobr></th>
                   <th><nobr>设备数量</nobr></th>
                   <th><nobr>设备别名</nobr></th>
-                  <th><nobr>缴费到期时间</nobr></th>
+                  <th>
+                    <!--<nobr>缴费到期时间</nobr>-->
+                    <data-order field="f_expire_date" name="缴费到期时间" :order.sync="$parent.$parent.$parent.orderFields.f_expire_date"></data-order>
+                  </th>
                   <th><nobr>累计维护缴费金额</nobr></th>
                 </tr>
               </template>
@@ -224,7 +230,7 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/userDeviceQuery', 20,{},{
+        model: new PagedList('rs/sql/userDeviceQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
           f_mtc_fee:0
         }),
         criteriaShow: false,
@@ -239,6 +245,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         thead: '',
         tfoot: '',
         show:false,
@@ -349,6 +360,24 @@
         })
         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()
       }
     },
     watch:{
@@ -375,7 +404,7 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition(){
-        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr,orderitem:this.orderitem}
       },
       getfield(){
         let data = {}

package/src/components/sale/filesquery/UserQuery.vue

@@ -288,7 +288,9 @@
               <template partial='head'>
                 <tr>
                   <th>
-                    <nobr>客户编号</nobr>
+                    <!--<nobr>客户编号</nobr>-->
+                    <data-order field="f_userinfo_code" name="客户编号"
+                                :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                   </th>
                   <th>
                     <nobr>客户名称</nobr>
@@ -337,7 +339,9 @@
                     <nobr>客户状态</nobr>
                   </th>
                   <th>
-                    <nobr>建档日期</nobr>
+                    <!--<nobr>建档日期</nobr>-->
+                    <data-order field="f_createfile_date" name="建档日期"
+                                :order.sync="$parent.$parent.$parent.orderFields.f_createfile_date"></data-order>
                   </th>
                   <th>
                     <nobr>建档人</nobr>

package/src/components/webmeter/gasStatistics/GasStatistics.vue

@@ -388,7 +388,7 @@
     },
     computed: {
       getstart(){
-        return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
+        return `开始时间：${this.$refs.paged.$refs.criteria.model.startDate} 结束时间：${this.$refs.paged.$refs.criteria.model.endDate}`
       },
       getPricenames() {
         let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
@@ -452,6 +452,8 @@
           con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
         }
         return {
+          startDate: this.$refs.paged.$refs.criteria.model.startDate,
+          endDate: this.$refs.paged.$refs.criteria.model.endDate,
           condition: con
         }
       }