manage-client 3.2.83-2 → 3.2.83-jb

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

@@ -15,9 +15,9 @@
     <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
       <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
     </tabs>
-    <!--<tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">-->
-      <!--<residential-arrears-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-arrears-query>-->
-    <!--</tabs>-->
+    <tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">
+      <residential-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
+    </tabs>
     <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
       <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
     </tabs>
@@ -84,12 +84,6 @@
     <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
       <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
     </tabs>
-    <tabs header="抄表情况记录表" v-if="permission('抄表情况记录表')">
-      <handplan-info v-if="show.includes('抄表情况记录表')"  @deal-msg="dealMsg"></handplan-info>
-    </tabs>
-    <tabs header="未抄表用户报表" v-if="permission('未抄表用户报表')">
-      <unhand-business @deal-msg="dealMsg"></unhand-business>
-    </tabs>
   </tab-button>
 
 </template>

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

@@ -7,6 +7,30 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showComponent"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="CommunityPaymen"
+                                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">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -39,30 +63,6 @@
                             close-on-select search="true">
                   </v-select>
                 </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>
-
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="CommunityPaymen"
-                                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" :show-component="$parent.$parent.showComponent"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-
               </div>
             </div>
           </criteria>

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

@@ -7,21 +7,8 @@
           <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 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>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -38,7 +25,21 @@
                 </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_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" 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="col-sm-2 form-group">
                   <label class="font_normal_body">小区名称</label>

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <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">
@@ -103,6 +103,9 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_othereason"
                          condition="f_othereason like '%{}%'" placeholder='其他原因'>
                 </div>
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              </div>
+              <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
                   <v-select class="select_list select"
@@ -124,7 +127,6 @@
                     <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
                   </div>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -133,9 +135,7 @@
             <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>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -156,9 +156,7 @@
                   <nobr>用气点名称</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>停用原因</nobr>
@@ -170,9 +168,7 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-<!--                  <nobr>停用日期</nobr>-->
-                  <data-order field="f_operate_date" name="停用日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr>停用日期</nobr>
                 </th>
                 <th>
                   <nobr>操作类型</nobr>
@@ -294,7 +290,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/disableQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
+        model: new PagedList('rs/sql/disableQuery', 20, {}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "停用状态", "停用原因", "其他停用原因", "同步状态"],
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -308,11 +304,6 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
         },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
         thead: '',
         showupload:false,
         selected:{},
@@ -435,26 +426,7 @@
         })
         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: {
       'all'(val) {
@@ -477,10 +449,7 @@
     },
     computed: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.disableConfig

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <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">
@@ -56,16 +56,38 @@
               </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">表&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                         condition="f_meternumber = '{}'" placeholder='表号'>
+                  <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='客户名称'
+                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
                 </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 = '{}'" placeholder='卡号'>
+                  <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 :value.sync="model.f_operat_type"
+                            v-model="model.f_operat_type"
+                            :options='$parent.$parent.operattype' placeholder='请选择'
+                            condition="f_operat_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+              </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">卡&emsp;&emsp;号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                       condition="f_card_id = '{}'" placeholder='卡号'>
+              </div>
+              <div class="row">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
                   <v-select class="select_list select"
@@ -87,26 +109,6 @@
                     <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
                   </div>
                 </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='客户名称'
-                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
-                </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">操作类型</label>
-                  <v-select :value.sync="model.f_operat_type"
-                            v-model="model.f_operat_type"
-                            :options='$parent.$parent.operattype' placeholder='请选择'
-                            condition="f_operat_type = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -115,9 +117,7 @@
             <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>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -129,9 +129,7 @@
                   <nobr>客户类型</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>启用原因</nobr>
@@ -143,9 +141,7 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-<!--                  <nobr>启用日期</nobr>-->
-                  <data-order field="f_operate_date" name="启用日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr>启用日期</nobr>
                 </th>
                 <th>
                   <nobr>操作类型</nobr>
@@ -256,7 +252,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/enableQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
+        model: new PagedList('rs/sql/enableQuery', 20, {}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -268,11 +264,6 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_enable_reason', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
         },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
         //默认打印列
         defaultfield: [],
         initres: {
@@ -280,7 +271,6 @@
           dep: [],
           user: [],
         },
-
         show: false,
         rowdata: {},
         thead: '',
@@ -396,27 +386,8 @@
         })
         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: {
       'all'(val) {
         if (val) {
@@ -438,10 +409,7 @@
     },
     computed: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.enableConfig

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

@@ -6,6 +6,32 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-inline auto" partial>
               <div class="row">
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"
+                                  v-ref:sel></res-select-group>
+
+
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="FMYgasQuery"
+                                template-name='用气查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
+                  ></print-data>
+
+                  <div style="float: right" class="button_spacing"
+                       :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                       @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">录入日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -46,32 +72,6 @@
                   >
                   </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>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="FMYgasQuery"
-                                template-name='用气查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
-                  ></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>

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <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">
@@ -123,9 +123,7 @@
             <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>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -137,9 +135,7 @@
                   <nobr>收据票号</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>卡号</nobr>
@@ -160,9 +156,7 @@
                   <nobr>卡费</nobr>
                 </th>
                 <th>
-<!--                  <nobr>补卡日期</nobr>-->
-                  <data-order field="f_operate_date" name="补卡日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr>补卡日期</nobr>
                 </th>
                 <th>
                   <nobr>付款方式</nobr>
@@ -293,18 +287,13 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillCardQuery', 20, {}, {f_cardfees: 0,hushu: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"],
         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']
         },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
         //默认打印列
         defaultfield: [],
         orgCondtionStr: '',
@@ -455,24 +444,6 @@
         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()
@@ -507,10 +478,7 @@
     },
     computed: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.fillcardConfig