manage-client 3.2.87 → 3.2.88-1

package/src/components/sale/filesquery/UserDeviceQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex">
         <div style="flex:1;" 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">
@@ -48,7 +48,7 @@
                                   :field="$parent.$parent.getExportField"
                                   :header="$parent.$parent.other"
                                   :footer="$parent.$parent.footer"
-                                  v-if="$parent.$parent.authArr.includes('档案查询导出')"
+                                  v-if="$parent.$parent.authArr.includes('用户设备查询导出')"
                                   sqlurl="rs/logic/exportfile"
                                   sql-name="userDeviceQuery"
                                   template-name='用户设备查询导出'  :choose-col="true"></export-excel>
@@ -131,7 +131,10 @@
             <data-grid  :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
               <template partial='head'>
                 <tr>
-                  <th><nobr>客户编号</nobr></th>
+                  <th>
+                    <!--<nobr>客户编号</nobr>-->
+                    <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  </th>
                   <th><nobr>客户名称</nobr></th>
                   <th><nobr>档案编号</nobr></th>
                   <th><nobr>用户性质</nobr></th>
@@ -140,7 +143,10 @@
                   <th><nobr>设备型号</nobr></th>
                   <th><nobr>设备数量</nobr></th>
                   <th><nobr>设备别名</nobr></th>
-                  <th><nobr>缴费到期时间</nobr></th>
+                  <th>
+                    <!--<nobr>缴费到期时间</nobr>-->
+                    <data-order field="f_expire_date" name="缴费到期时间" :order.sync="$parent.$parent.$parent.orderFields.f_expire_date"></data-order>
+                  </th>
                   <th><nobr>累计维护缴费金额</nobr></th>
                 </tr>
               </template>
@@ -224,7 +230,7 @@
       return {
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/userDeviceQuery', 20,{},{
+        model: new PagedList('rs/sql/userDeviceQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
           f_mtc_fee:0
         }),
         criteriaShow: false,
@@ -239,6 +245,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         thead: '',
         tfoot: '',
         show:false,
@@ -349,6 +360,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:{
@@ -375,7 +404,7 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition(){
-        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr,orderitem:this.orderitem}
       },
       getfield(){
         let data = {}

package/src/components/sale/filesquery/UserQuery.vue

@@ -288,7 +288,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>
@@ -337,7 +339,9 @@
                     <nobr>客户状态</nobr>
                   </th>
                   <th>
-                    <nobr>建档日期</nobr>
+                    <!--<nobr>建档日期</nobr>-->
+                    <data-order field="f_createfile_date" name="建档日期"
+                                :order.sync="$parent.$parent.$parent.orderFields.f_createfile_date"></data-order>
                   </th>
                   <th>
                     <nobr>建档人</nobr>