manage-client 3.2.87 → 3.2.88-1

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search" v-if="!show">
       <div class="flex">
 
-        <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">
@@ -78,7 +78,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>
@@ -108,7 +109,8 @@
                   <nobr>详情</nobr>
                 </th>
                 <th>
-                  <nobr>缴费日期</nobr>
+                  <!--<nobr>缴费日期</nobr>-->
+                  <data-order field="f_charge_date" name="缴费日期" :order.sync="$parent.$parent.$parent.orderFields.f_charge_date"></data-order>
                 </th>
 
                 <th>
@@ -244,7 +246,7 @@
         other:[],
         footer:[],
         data: {},
-        model: new PagedList('rs/sql/gaslossQuery', 20, {}, {
+        model: new PagedList('rs/sql/gaslossQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}, {
           f_collection: 0
         }),
         initres: {
@@ -265,6 +267,11 @@
         f_filialeid: this.$login.f.f_orgid,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_userinfo_code desc',
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
         thead: '',
         tfoot: '',
         showupload:false,
@@ -432,6 +439,24 @@
           }
         })
         this.modelval = sortModel
+      },
+      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: {
@@ -494,6 +519,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
+          orderitem: this.orderitem,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {

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

@@ -46,7 +46,7 @@
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 :defaultselect="$parent.$parent.defaultexport"
-                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='团缴查询导出'
                                 :choose-col="true">
                   </export-excel>
 
@@ -107,7 +107,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>
@@ -134,7 +135,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>