address-client 1.6.80 → 1.6.83

package/package.json

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

package/src/components/AddAreaMsg.vue

@@ -898,8 +898,8 @@ export default {
           this.areamodel.twoalarm = 10
           if (this.areamodel.default_devices.length === 0 && !this.f_special) this.areamodel.default_devices = ['灶具', '热水器']
         } else if (this.areamodel.f_price_name.indexOf('锅炉') > -1) {
-          this.areamodel.onealarm = 200
-          this.areamodel.twoalarm = 100
+          this.areamodel.onealarm = 20
+          this.areamodel.twoalarm = 10
           if (this.areamodel.default_devices.length === 0 && !this.f_special) this.areamodel.default_devices = ['灶具', '壁挂锅炉']
         }
       }

package/src/components/AreaList.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="stand-work-list" class="datapanel flex bg-white p-10">
-    <criteria-paged :model="model" v-ref:paged>
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
       <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
         <div novalidate class="form-inline auto" partial>
           <!--  <div class="form-group form-input-group"  v-if="$parent.$parent.f_special">
@@ -77,7 +77,11 @@
             <th><nobr>区/县</nobr></th>
             <th><nobr>街道名称</nobr></th>
             <!--民用小区信息开始-->
-            <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区ID</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special">
+<!--              <nobr>小区ID</nobr>-->
+              <data-order field="oldid" name="小区ID"
+                          :order.sync="$parent.$parent.$parent.orderFields.oldid"></data-order>
+            </th>
             <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
             <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
             <!--民用小区信息结束-->
@@ -134,11 +138,14 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/address_getarealist',20),
+        model: new PagedList('rs/sql/address_getarealist',20,{orderitem:`' oldid asc '`}),
         userid: this.$login.f.id,
         source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         addflag: false,
-        addtitle:''
+        addtitle:'',
+        orderFields: {
+          oldid:'asc'
+        }
       }
     },
     title: '小区管理',
@@ -170,6 +177,26 @@
           }
         }
       },
+      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()
+      },
       add(val){
         this.$refs.paged.$refs.grid.selectStore.selected = null
         this.$dispatch('add')