manage-client 3.2.80 → 3.2.83-1

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

@@ -6,44 +6,6 @@
           <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"  @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="span" style="float:right;">
-                  <!--<read-idcard></read-idcard>-->
-                  <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="areaGeneralQuery"
-                                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>
-
-                  <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
-                              <!--:defaultfield="$parent.$parent.defaultfield" print-name="收费查询"-->
-                              <!--: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%"
@@ -83,6 +45,41 @@
                   <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>-->
+                  <!--<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;">
+                  <!--<read-idcard></read-idcard>-->
+                  <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="areaGeneralQuery"
+                                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>
+                  <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
+                              <!--:defaultfield="$parent.$parent.defaultfield" print-name="收费查询"-->
+                              <!--: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_phone"-->
@@ -98,8 +95,6 @@
                   <!--<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_user_type"

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

@@ -7,30 +7,6 @@
           <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"  @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="BalanceTable"
-                                template-name='可用余额查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="余额查询打印"
-                              :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%"
@@ -38,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              >
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -48,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                             >
+                  >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -56,17 +32,39 @@
                   <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="u.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="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="BalanceTable"
+                                template-name='可用余额查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="余额查询打印"
+                              :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="u.f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"

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

@@ -3,21 +3,10 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged>
+        <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">公&emsp;&emsp;司</label>
-                  <right-tree @re-res="getorg"
-                              :initresid='initres.org'></right-tree>
-                </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 for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -38,7 +27,23 @@
                               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>
+                  <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="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -52,16 +57,17 @@
                   <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">
+              <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_user_name"
                          condition=" f_user_name like '%{}%'" placeholder='用户名称'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">操作人</label>
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;操作人</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_operator"
                          condition=" f_operator like '%{}%'" placeholder='操作人'>
                 </div>
@@ -80,6 +86,12 @@
                   <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">公&emsp;&emsp;司</label>-->
+                  <!--<right-tree @re-res="getorg"-->
+                              <!--:initresid='initres.org'></right-tree>-->
+                <!--</div>-->
+                <res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes"  v-ref:sel></res-select-group>
               </div>
 
             </div>
@@ -112,9 +124,15 @@
                 <th>
                   <nobr>操作日期</nobr>
                 </th>
+                <th>
+                  <nobr>付款方式</nobr>
+                </th>
                 <th>
                   <nobr>组织名称</nobr>
                 </th>
+                <th>
+                  <nobr>支付渠道</nobr>
+                </th>
                 <th>
                   <nobr>部门名称</nobr>
                 </th>
@@ -149,9 +167,15 @@
               <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_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bank_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>
               </td>
@@ -230,8 +254,9 @@
         tfoot: '',
         orgrestype:'organization',
         defaultfield: [],
+        resshow:['company'],
         initres: {
-          org:[this.$login.f.orgid],
+          org:[this.$login.f.orgid]
         },
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee',  'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
@@ -287,8 +312,19 @@
           this.$refs.paged.$refs.cri.model[key] = []
         })
       },
-      getRes(obj) {
-        this.orgCondtionStr = obj
+      // getRes(obj) {
+      //   this.orgCondtionStr = obj
+      // },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
       },
       stamp() {
         this.all = false
@@ -361,6 +397,9 @@
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
+      payments() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      },
       getfield() {
         return exportConfig.businesConfig
       }

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

@@ -91,7 +91,9 @@
     <tabs header="团缴查询" v-if="permission('团缴查询')">
       <group-charge-query v-if="show.includes('团缴查询')" @deal-msg="dealMsg" :data="data"></group-charge-query>
     </tabs>
-
+    <tabs header="气费阶梯明细" v-if="permission('气费阶梯明细')">
+      <selling-charge-price v-if="show.includes('气费阶梯明细')" @deal-msg="dealMsg" :data="data"></selling-charge-price>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

package/src/components/sale/businessquery/CancellationQuery.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>
+        <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">
@@ -83,7 +83,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>
@@ -98,7 +100,9 @@
                   <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>
@@ -107,7 +111,9 @@
                   <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>
@@ -219,7 +225,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/CancellationQuery', 20, {}),
+        model: new PagedList('rs/sql/CancellationQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "销户状态", "销户原因", "同步状态"],
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_sendsuccess"],
@@ -235,6 +241,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         defaultfield: [],
         selected:{},
         tfoot: '',
@@ -317,6 +328,25 @@
         this.printshow = true
         this.put()
       },
+      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()
+      },
+
       put() {
         // 对Modelval进行排序
         this.sortModelval()
@@ -377,7 +407,8 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
       },
       getfield() {
         return exportConfig.CancellationConfig

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

@@ -1,8 +1,8 @@
 <template>
   <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
+    <div class="basic-main" @keyup.enter="search" >
       <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">
@@ -110,7 +110,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>
@@ -137,7 +139,9 @@
                   <nobr>余量</nobr>
                 </th>
                 <th>
-                  <nobr>录入日期</nobr>
+<!--                  <nobr>录入日期</nobr>-->
+                  <data-order field="f_hand_date" name="录入日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
                 </th>
                 <th>
                   <nobr>抄表员</nobr>
@@ -252,7 +256,12 @@
     data() {
       return {
         data: {},
-        model: new PagedList('rs/sql/cardhandplanQuery', 20, {}, {
+        //排序
+        orderitem:'f_input_date desc',
+        orderFields: {
+          f_input_date : 'no'
+        },
+        model: new PagedList('rs/sql/cardhandplanQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc"}, {
           f_real_amount: 0
         }),
         initres: {
@@ -380,6 +389,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: {
@@ -397,7 +424,8 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc "}
       },
       getfield() {
         return exportConfig.cardhandplanConfig

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

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row"  >
     <div class="basic-main"  @keyup.enter="search" >
       <div class="flex"  :class="{showbottom:showbottomsum}" 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">
@@ -181,7 +181,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>
@@ -193,7 +195,9 @@
                   <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>
@@ -235,7 +239,9 @@
                   <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>
@@ -424,7 +430,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -439,6 +445,11 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
         },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         show:false,
         rowdata:{},
         showupload:false,
@@ -586,7 +597,25 @@
         })
         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) {
@@ -612,7 +641,9 @@
       //   return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
       // },
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
       },
       getfield() {
         return exportConfig.changemeterConfig