address-client 3.2.74 → 3.2.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.74",
+  "version": "3.2.75",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/filiale/shanxian/AddressList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex" @keyup.enter="search">
-    <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">
@@ -143,7 +143,7 @@
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
           <th><nobr>街道/乡镇</nobr></th>
           <th><nobr>小区(单位)</nobr></th>
-          <th><nobr>详细地址</nobr></th>
+          <th><data-order field="f_address" name="详细地址"></data-order></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼号</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
@@ -284,6 +284,11 @@
         isbusy:false,
         addflag: false,
         addtitle:'',
+        // 排序
+        orderitem: 'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         other: [],
         footer: [],
         getfield: {},
@@ -333,6 +338,25 @@
       //this.$refs.paged.$refs.grid.selectInit()
     },
     methods: {
+
+      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()
+      },
       downloadFiles(){
         let downurl='rs/downloadfile/file?filename=地址导入Excel模板';
         this.$resetget(downurl,{}).then(res=>{

package/src/filiale/shanxian/AreaList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex" @keyup.enter="search">
-    <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">
@@ -128,7 +128,7 @@
             <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
             <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
             <th><nobr>操作人</nobr></th>
-            <th><nobr>操作日期</nobr></th>
+            <th><data-order field="f_operate_date" name="操作日期"></data-order></th>
             <th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
             <th><nobr>操作</nobr></th>
         </template>
@@ -211,7 +211,12 @@
           f_slice_area: '',
           f_residential_area: ''
         },
-        model: new PagedList('rs/sql/address_getarealist',20),
+        model: new PagedList('rs/sql/address_getarealist',20, {orderitem: '"f_operate_date DESC"'}),
+        // 排序
+        orderitem: 'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         addflag: false,
         addtitle:'',
         getfield: {},
@@ -266,6 +271,24 @@
         this.$refs.paged.$refs.cri.search()
       },
 
+      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()
+      },
       async delete(row){
         if(row.id >= 0){
           var id = row.id