manage-client 3.2.87 → 3.2.88-1

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

@@ -3,7 +3,7 @@
     <div class="basic-main">
       <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>
@@ -87,7 +88,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>
@@ -185,7 +187,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/yucunDetails', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/yucunDetails', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
           f_last_balance:0,
           f_charge_money:0,
           f_pre_deduct_money:0,
@@ -197,6 +199,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         config: {
           defaultPrint: ["f_userinfo_code", "f_user_name", "f_last_balance", "f_charge_money", "f_pre_deduct_money", "f_balance"]
         },
@@ -307,6 +314,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: {
@@ -333,6 +358,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() {