manage-client 3.2.87 → 3.2.88-1

package/src/components/sale/businessquery/BusinesQuery.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">
@@ -101,7 +101,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>
@@ -110,7 +111,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>
@@ -122,7 +124,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>
@@ -238,7 +241,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/BusinesQuery', 20, {}, {f_money: 0}),
+        model: new PagedList('rs/sql/BusinesQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_money: 0}),
         criteriaShow: false,
         bodyData: ["f_userinfo_code", "f_user_name", "f_money", "f_operat_type","f_state", "f_operate_date", "f_orgname", "f_depname", "f_operator"],
         orgCondtionStr: '',
@@ -248,6 +251,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         thead: '',
         showupload:false,
         selected:{},
@@ -372,6 +380,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: {
@@ -395,7 +421,7 @@
     },
     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}
       },
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]