address-client 1.6.79 → 1.6.82

package/src/components/AreaList.vue

@@ -1,200 +1,227 @@
-<template>
-  <div id="stand-work-list" class="datapanel flex bg-white p-10">
-    <criteria-paged :model="model" v-ref:paged>
-      <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">
-              <input  type="text" class="form-control _zoom2" v-model="model.f_province"
-                      condition="oldid like '%{}%'" placeholder="单位ID"
-                      :size="model.oldid ? model.oldid.length*2 : 2"/>
-            </div>
-            <div class="form-group form-input-group"  v-if="!$parent.$parent.f_special">
-              <input  type="text" class="form-control _zoom2" v-model="model.f_province"
-                      condition="oldid like '%{}%'" placeholder="小区ID"
-                      :size="model.oldid ? model.oldid.length*2 : 2"/>
-            </div>-->
-          <div class="row">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body _zoom4">省份</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.f_province"
-                      condition="f_province like '%{}%'" placeholder="省份"/>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body _zoom4">城市</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.f_city"
-                      condition="f_city like '%{}%'" placeholder="城市"/>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body _zoom4">区县</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.f_district"
-                      condition="f_district like '%{}%'" placeholder="区县"/>
-            </div>
-            <div class="col-sm-3" style="display: inline-block;float: right;text-align: right">
-              <button class="btn btn-success " @click="search()" >查询</button>
-              <button class="btn btn-success " @click="$parent.$parent.clear()">清空</button>
-            </div>
-          </div>
-          <div class="row" style="margin-top: 5px">
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body _zoom4">街道</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道"/>
-            </div>
-            <div class="form-group col-sm-3"  v-if="$parent.$parent.f_special">
-              <label class="font_normal_body _zoom4" >单位ID</label>
-              <input  type="text" class="form-control _zoom6"  v-model="model.oldid"
-                      condition="oldid like '%{}%'" placeholder="单位ID"/>
-            </div>
-            <div class="form-group col-sm-3" v-if="$parent.$parent.f_special">
-              <label class="font_normal_body _zoom4" >单位</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.f_residential_area"
-                      condition="f_residential_area like '%{}%'" placeholder="单位"/>
-            </div>
-            <div class="form-group col-sm-3" v-if="!$parent.$parent.f_special">
-              <label class="font_normal_body _zoom4" >小区ID</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.oldid"
-                      condition="oldid like '%{}%'" placeholder="小区ID"/>
-            </div>
-            <div class="form-group col-sm-3" v-if="!$parent.$parent.f_special">
-              <label class="font_normal_body _zoom4"  >小区</label>
-              <input  type="text" class="form-control _zoom6" v-model="model.f_residential_area"
-                      condition="f_residential_area like '%{}%'" placeholder="小区"/>
-            </div>
-            <div class="col-sm-3" style="display: inline-block;float: right;text-align: right">
-              <button v-if="!$parent.$parent.f_special" class="btn btn-success "  @click="$parent.$parent.add('小区')">&nbsp;&nbsp;&nbsp;&nbsp;添加小区&nbsp;&nbsp;&nbsp;</button>
-              <button v-if="$parent.$parent.f_special"  class="btn btn-success "  @click="$parent.$parent.add('单位')">&nbsp;&nbsp;&nbsp;&nbsp;添加单位&nbsp;&nbsp;&nbsp;</button>
-            </div>
-          </div>
-
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th><nobr>id</nobr></th>
-            <th><nobr>省份</nobr></th>
-            <th><nobr>城市</nobr></th>
-            <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>小区名称</nobr></th>
-            <th v-if="!$parent.$parent.$parent.f_special"><nobr>详细地址</nobr></th>
-            <!--民用小区信息结束-->
-            <!--非民用单位信息开始-->
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位ID</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
-            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
-            <!--非民用单位信息结束-->
-            <th><nobr>片区/管理站 </nobr></th>
-            <th><nobr>营业网点</nobr></th>
-            <th><nobr>操作人</nobr></th>
-            <th><nobr>操作日期</nobr></th>
-            <th><nobr>操作</nobr></th>
-
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align:center"><nobr>{{row.id}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.oldid}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_area_address}}</nobr></td>
-            <!--非民用单位信息开始-->
-            <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
-            <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
-            <!--非民用单位信息结束-->
-            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_outlets}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
-            <td><nobr>
-              <!--<button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
-            </nobr></td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getarealist',20),
-        userid: this.$login.f.id,
-        source:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        addflag: false,
-        addtitle:''
-      }
-    },
-    title: '小区管理',
-    props:{
-      f_special:{
-        type: String
-      }
-    },
-    ready(){
-
-    },
-    methods: {
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
-            {data: {
-              items: 'count(*) num',
-                tablename: 't_user_address',
-                condition: `f_residential_area_id='${id}'`}
-                },
-            {resolveMsg: null, rejectMsg: null})
-          if(useraredss.data[0].num>0){
-            this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
-      add(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('add')
-      },
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      search (args) {
-        if(this.f_special){
-          args.condition =  `${args.condition} and s.f_special='1' `
-        }else{
-          args.condition =  `${args.condition} and s.f_special is null  `
-        }
-        this.$dispatch('search',args)
-        this.model.search(args.condition, args.model)
-      },
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-    },
-    watch:{
-
-    }
-
-  }
-</script>
+<template>
+  <div id="stand-work-list" class="datapanel flex bg-white p-10">
+    <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">
+              <input  type="text" class="form-control _zoom2" v-model="model.f_province"
+                      condition="oldid like '%{}%'" placeholder="单位ID"
+                      :size="model.oldid ? model.oldid.length*2 : 2"/>
+            </div>
+            <div class="form-group form-input-group"  v-if="!$parent.$parent.f_special">
+              <input  type="text" class="form-control _zoom2" v-model="model.f_province"
+                      condition="oldid like '%{}%'" placeholder="小区ID"
+                      :size="model.oldid ? model.oldid.length*2 : 2"/>
+            </div>-->
+          <div class="row">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body _zoom4">省份</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"/>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body _zoom4">城市</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"/>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body _zoom4">区县</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"/>
+            </div>
+            <div class="col-sm-3" style="display: inline-block;float: right;text-align: right">
+              <button class="btn btn-success " @click="search()" >查询</button>
+              <button class="btn btn-success " @click="$parent.$parent.clear()">清空</button>
+            </div>
+          </div>
+          <div class="row" style="margin-top: 5px">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body _zoom4">街道</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.f_street"
+                      condition="f_street like '%{}%'" placeholder="街道"/>
+            </div>
+            <div class="form-group col-sm-3"  v-if="$parent.$parent.f_special">
+              <label class="font_normal_body _zoom4" >单位ID</label>
+              <input  type="text" class="form-control _zoom6"  v-model="model.oldid"
+                      condition="oldid like '%{}%'" placeholder="单位ID"/>
+            </div>
+            <div class="form-group col-sm-3" v-if="$parent.$parent.f_special">
+              <label class="font_normal_body _zoom4" >单位</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.f_residential_area"
+                      condition="f_residential_area like '%{}%'" placeholder="单位"/>
+            </div>
+            <div class="form-group col-sm-3" v-if="!$parent.$parent.f_special">
+              <label class="font_normal_body _zoom4" >小区ID</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.oldid"
+                      condition="oldid like '%{}%'" placeholder="小区ID"/>
+            </div>
+            <div class="form-group col-sm-3" v-if="!$parent.$parent.f_special">
+              <label class="font_normal_body _zoom4"  >小区</label>
+              <input  type="text" class="form-control _zoom6" v-model="model.f_residential_area"
+                      condition="f_residential_area like '%{}%'" placeholder="小区"/>
+            </div>
+            <div class="col-sm-3" style="display: inline-block;float: right;text-align: right">
+              <button v-if="!$parent.$parent.f_special" class="btn btn-success "  @click="$parent.$parent.add('小区')">&nbsp;&nbsp;&nbsp;&nbsp;添加小区&nbsp;&nbsp;&nbsp;</button>
+              <button v-if="$parent.$parent.f_special"  class="btn btn-success "  @click="$parent.$parent.add('单位')">&nbsp;&nbsp;&nbsp;&nbsp;添加单位&nbsp;&nbsp;&nbsp;</button>
+            </div>
+          </div>
+
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th><nobr>id</nobr></th>
+            <th><nobr>省份</nobr></th>
+            <th><nobr>城市</nobr></th>
+            <th><nobr>区/县</nobr></th>
+            <th><nobr>街道名称</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>
+            <!--民用小区信息结束-->
+            <!--非民用单位信息开始-->
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位ID</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
+            <!--非民用单位信息结束-->
+            <th><nobr>片区/管理站 </nobr></th>
+            <th><nobr>营业网点</nobr></th>
+            <th><nobr>操作人</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+            <th><nobr>操作</nobr></th>
+
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center"><nobr>{{row.id}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.oldid}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_area_address}}</nobr></td>
+            <!--非民用单位信息开始-->
+            <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
+            <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
+            <!--非民用单位信息结束-->
+            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_outlets}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+            <td><nobr>
+              <!--<button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+            </nobr></td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    data () {
+      return {
+        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:'',
+        orderFields: {
+          oldid:'asc'
+        }
+      }
+    },
+    title: '小区管理',
+    props:{
+      f_special:{
+        type: String
+      }
+    },
+    ready(){
+
+    },
+    methods: {
+      async delete(row){
+        if(row.id){
+          var id = row.id
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+            {data: {
+              items: 'count(*) num',
+                tablename: 't_user_address',
+                condition: `f_residential_area_id='${id}'`}
+                },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data[0].num>0){
+            this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      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')
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      search (args) {
+        if(this.f_special){
+          args.condition =  `${args.condition} and s.f_special='1' `
+        }else{
+          args.condition =  `${args.condition} and s.f_special is null  `
+        }
+        this.$dispatch('search',args)
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+    },
+    watch:{
+
+    }
+
+  }
+</script>

package/src/components/AreaManage.vue

@@ -1,73 +1,73 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="flex" style="flex: 1; width:60%">
-      <area-list @select-changed="selected" v-ref:arealist></area-list>
-    </div>
-    <div v-show="areaShow" class="datapanel" style="margin-left: 10px;width: 40%">
-      <div class="flex">
-        <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
-                      :row="arearow"></add-area-msg>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '小区管理',
-  components: {},
-  data() {
-    return {
-      //分公司id串
-      areaShow: false,
-      areatype: '小区',
-      arearow: {},
-    }
-  },
-  ready() {
-  },
-  props: {},
-  methods: {
-    selected(obj) {
-      if (obj.val && obj.val.id) {
-        this.areaShow = true
-        this.$refs.addareamsg.cleardara()
-        this.$refs.addareamsg.operation = 'modify'
-        this.$refs.addareamsg.areatype = '小区'
-        try {
-          obj.val.default_devices = obj.val.default_devices ? JSON.parse(obj.val.default_devices) : []
-        }catch (e){
-          console.log("设备赋值错误")
-        }        this.$refs.addareamsg.areamodel = Object.assign({}, obj.val)
-        this.$refs.addareamsg.oldsize = obj.val.card_size
-        this.$refs.addareamsg.initdata()
-      }
-    }
-  },
-  events: {
-    'add'() {
-      this.areaShow = true
-      this.$refs.addareamsg.cleardara()
-      this.$refs.addareamsg.operation = 'add'
-      this.$refs.addareamsg.areatype = '小区'
-      this.$refs.addareamsg.oldsize = 0
-      this.$refs.addareamsg.initdata()
-    },
-    'modify'(area) {
-
-    },
-    'confirm'() {
-      this.$refs.arealist.$refs.paged.$refs.cri.search()
-      this.areaShow = false
-    },
-    'cancel'() {
-      this.$refs.arealist.$refs.paged.$refs.cri.search()
-      this.areaShow = false
-    },
-    'search'() {
-      this.areaShow = false
-    },
-  }
-}
-</script>
-
+<template>
+  <div id="unit" class="flex-row">
+    <div class="flex" style="flex: 1; width:60%">
+      <area-list @select-changed="selected" v-ref:arealist></area-list>
+    </div>
+    <div v-show="areaShow" class="datapanel" style="margin-left: 10px;width: 40%">
+      <div class="flex">
+        <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
+                      :row="arearow"></add-area-msg>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '小区管理',
+  components: {},
+  data() {
+    return {
+      //分公司id串
+      areaShow: false,
+      areatype: '小区',
+      arearow: {},
+    }
+  },
+  ready() {
+  },
+  props: {},
+  methods: {
+    selected(obj) {
+      if (obj.val && obj.val.id) {
+        this.areaShow = true
+        this.$refs.addareamsg.cleardara()
+        this.$refs.addareamsg.operation = 'modify'
+        this.$refs.addareamsg.areatype = '小区'
+        try {
+          obj.val.default_devices = obj.val.default_devices ? JSON.parse(obj.val.default_devices) : []
+        }catch (e){
+          console.log("设备赋值错误")
+        }        this.$refs.addareamsg.areamodel = Object.assign({}, obj.val)
+        this.$refs.addareamsg.oldsize = obj.val.card_size
+        this.$refs.addareamsg.initdata()
+      }
+    }
+  },
+  events: {
+    'add'() {
+      this.areaShow = true
+      this.$refs.addareamsg.cleardara()
+      this.$refs.addareamsg.operation = 'add'
+      this.$refs.addareamsg.areatype = '小区'
+      this.$refs.addareamsg.oldsize = 0
+      this.$refs.addareamsg.initdata()
+    },
+    'modify'(area) {
+
+    },
+    'confirm'() {
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+      this.areaShow = false
+    },
+    'cancel'() {
+      this.$refs.arealist.$refs.paged.$refs.cri.search()
+      this.areaShow = false
+    },
+    'search'() {
+      this.areaShow = false
+    },
+  }
+}
+</script>
+