address-client 3.2.15 → 3.2.19

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Jan 25 14:23:48 CST 2022
-gradle.version=5.5
+#Fri Aug 06 15:02:49 CST 2021
+gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/AddressClient.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="AddressClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.0.11" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/dev-server.js

@@ -10,7 +10,7 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://127.0.0.1:8078', str2= 'http://121.36.106.17:8400/'
+var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
 var proxyTable = {
 
   '/rs/logic/getLogin': {
@@ -39,7 +39,7 @@ var proxyTable = {
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: str2
+    target: str
   }
 }
 

package/package.json

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

package/src/components/AddressList.vue

@@ -140,7 +140,7 @@
           <th><nobr>序号</nobr></th>
           <th><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>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
           <th><nobr>街道/乡镇</nobr></th>
           <th><nobr>小区(单位)</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼号</nobr></th>

package/src/components/CityList.vue

@@ -1,133 +1,133 @@
-<template>
-  <div class="flex" @keyup.enter="search">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-6 form-group">
-              <label class="font_normal_body">省份</label>
-              <input  type="text"   class="input_search" v-model="model.f_province"
-                      condition="f_province like '%{}%'" placeholder="省份"
-                      :size="model.f_province ? model.f_province.length*2 : 6"/>
-            </div>
-            <div  class="col-sm-4 form-group button-range">
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <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></th>
-            <th><nobr>城市</nobr></th>
-            <th><nobr>区/县</nobr></th>
-            <th><nobr>省市区编码</nobr></th>
-            <th title="该区域下现有的街道数"><nobr>街道数量</nobr></th>
-            <th><nobr>操作</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr @click="$parent.$parent.changestyle()">
-            <td style="text-align:center"><nobr>{{$index + 1}}</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_pcd_number}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
-            <td style="text-align:center"><nobr>
-              <button v-if="row.streenum === 0" type="button" name="button" class="btn btn-danger"
-                      style="padding: 5px 12px"
-                      @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'
-  let readyGen = async function (self) {
-    self.getfield = self.config.excelHeaders
-  }
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getcitylist',20),
-        addflag: false,
-        getfield: {},
-        f_orgid: ''
-      }
-    },
-    props:{
-      f_filialeids:{
-        type: String
-      }
-    },
-    ready(){
-      readyGen(this)
-      this.search()
-    },
-    methods: {
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-      async delete(row){
-        if(row.id >= 0 ){
-          var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
-            {data: {
-                items: 'f_pcd_id',
-                tablename: 't_street',
-                condition: `f_pcd_id='${id}'`}
-            },
-            {resolveMsg: null, rejectMsg: null})
-          if(useraredss.data.length>0){
-            this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
-      add(val){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add',val)
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-      },
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      selfSearch (args) {
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-        args.condition = `${args.condition} and p.f_filialeid  in ${this.f_orgid}`
-        this.model.search(args.condition, args.model)
-      },
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
-      }
-    },
-    computed: {
-      getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and p.f_filialeid = '${this.f_filialeids}'`}
-      }
-    }
-  }
-</script>
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">省份</label>
+              <input  type="text"   class="input_search" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"
+                      :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div  class="col-sm-4 form-group button-range">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <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></th>
+            <th><nobr>城市</nobr></th>
+            <th><nobr>区/县</nobr></th>
+            <th><nobr>省市区编码</nobr></th>
+            <th title="该区域下现有的街道数"><nobr>街道数量</nobr></th>
+            <th><nobr>操作</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr @click="$parent.$parent.changestyle()">
+            <td style="text-align:center"><nobr>{{$index + 1}}</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_pcd_number}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
+            <td style="text-align:center"><nobr>
+              <button v-if="row.streenum === 0" type="button" name="button" class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @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'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+  }
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/address_getcitylist',20),
+        addflag: false,
+        getfield: {},
+        f_orgid: ''
+      }
+    },
+    props:{
+      f_filialeids:{
+        type: String
+      }
+    },
+    ready(){
+      readyGen(this)
+      this.search()
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async delete(row){
+        if(row.id >= 0 ){
+          var id = row.id
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+            {data: {
+                items: 'f_pcd_id',
+                tablename: 't_street',
+                condition: `f_pcd_id='${id}'`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+            this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition = `${args.condition} and p.f_filialeid  in ${this.f_orgid}`
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + `and p.f_filialeid = '${this.f_filialeids}'`}
+      }
+    }
+  }
+</script>

package/src/components/StreetList.vue

@@ -71,9 +71,9 @@
             <th><nobr>省份</nobr></th>
             <th><nobr>城市</nobr></th>
             <th><nobr>区/县</nobr></th>
-            <th><nobr>街道/乡镇</nobr></th>
             <th><data-order field="f_iscity" name="地区类型"
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
+            <th><nobr>街道/乡镇</nobr></th>
             <th><nobr>街道编号</nobr></th>
             <th><data-order field="f_address" name="详细地址"
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
@@ -88,8 +88,8 @@
             <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.f_iscity}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
@@ -118,11 +118,11 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'id desc'`}),
+        model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
         addflag: false,
         getfield: {},
         //排序
-        orderitem:'id desc',
+        orderitem:'f_city,f_district,f_iscity,f_street desc',
         addtitle:'',
         // 公司下拉
         curorgid: [this.$login.f.orgid],