address-client 3.2.105-yangchun → 3.2.107-yangchun

package/build/dev-server.js

@@ -3,103 +3,103 @@ var webpack = require('webpack')
 var config = require('./webpack.dev.conf')
 var proxyMiddleware = require('http-proxy-middleware')
 var httpProxy = require('http-proxy')
-
+var checkVersion = require('./versionCheck.js')
+checkVersion()
 var app = express()
 var compiler = webpack(config)
 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:8288/', str2= 'http://172.168.1.11:9001/#'
-var str3= 'http://172.168.1.11:9001/#'
-var str4='http://127.0.0.1:8080'
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
+var str = 'http://192.168.50.4:8400', str2= 'http://192.168.50.4:8400'
+var str3= 'http://192.168.50.4:8400'
 var proxyTable = {
-  '/api': {
-    target: v4Url
-  },
-  '/invoice/rs/logic/getInvoice': {
-    target: serverRul
-  },
-  '/rs/sql/address_getarealist':{
-    target:str4
+  '/api/af-auth': {
+    target: str
   },
-  '/rs/sql/filemanage_getUserfies':{
-    target: 'http://127.0.0.1:8080/'
+  '/api/af-system': {
+    target: str
   },
-  '/rs/logic/importNetworkValve':{
-    target: 'http://127.0.0.1:8080/'
+  '/api/af-revenue': {
+    pathRewrite: {'/api/af-revenue': '/'},
+    target: 'http://127.0.0.1:9026'
   },
-  '/rs/file': {
-    target: localUrl
+  '/rs/entity': {
+    target: str
+    // secure:true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/webapps': {
-    target: serverRul
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/rs/sql/singleTable': {
-    target: serverRul
-  },
-  '/invoice': {
-    target: serverRul
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: serverRul
-  },
-  // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true,
   },
   '/rs/logic/getSaleInitData': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  // '/rs/logic':{
+  //   target: str3,
+  //   secure:true,
+  //   changeOrigin:true
+  //   // target: 'http://127.0.0.1:8080'
+  // },
+  '/rs/vue': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  // 用户登录服务地址
   '/rs/user': {
-    target: serverRul
-  },
-  '/rs/path': {
-    target: serverRul
-  },
-  '/rs/data': {
-    target: serverRul
-  },
-  '/rs/license': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/db': {
-    target: serverRul
-  },
-  '/excel': {
-    target: serverRul
-  },
-  '/rs/config': {
-    target: serverRul
-  },
-  '/rs/report': {
-    target: serverRul
-  },
-  '/rs/vue': {
-    target: serverRul
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
-  '/rs/logic/webHandReverse': {
-    target: 'http://localhost:8085'
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/rs/logic': {
-    target: localUrl
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
   },
   '/rs/sql': {
-    target: localUrl
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
-  '/webmeter': {
-    target: serverRul
+  '/rs/logic': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: serverRul
-    // changeOrigin: true
+    // target: 'http://192.168.50.199:8300'
+    target: str3,
+    secure:true,
+    changeOrigin:true
   }
 }
 

package/build/versionCheck.js

@@ -0,0 +1,31 @@
+function isVersionGreaterThan (version1, version2) {
+  const v1parts = version1.split('.')
+  const v2parts = version2.split('.')
+  let flag = false
+  for (let i = 0; i < v1parts.length; ++i) {
+    if (v1parts[i] > v2parts[i]) {
+      flag = true
+      break
+    }
+  }
+
+  return flag
+}
+
+const pkg = require('../package.json')
+const checkVersion = () => {
+  console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 addressclient 版本, 会发送 api/af-revenue/sql ,api/af-revenue/logic 到v4 服务')
+  const {devDependencies} = pkg
+  if (devDependencies && devDependencies['system-clients']) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请查看营收后台升级日志：' +
+        'http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
+    }
+  }
+}
+
+module.exports = checkVersion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.105-yangchun",
+  "version": "3.2.107-yangchun",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -23,6 +23,7 @@
     "url": "https://gitee.com/aote/address_management.git"
   },
   "dependencies": {
+    "crypto-js": "^4.1.1",
     "less-loader": "^2.2.3",
     "vue": "^1.0.17"
   },
@@ -79,9 +80,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "ldap-clients": "3.0.48",
-    "system-clients": "3.2.68",
+    "system-clients": "3.2.95",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.98",
+    "vue-client": "1.24.150",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/AddAreaMsg.vue

@@ -401,7 +401,7 @@
         // }
         this.areaslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
           data: {
             items: '*',
             tablename: 't_area',
@@ -425,7 +425,7 @@
       async initpcds(pconditon){
         this.pcdslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_pcd',
@@ -449,7 +449,7 @@
       async initstreets(pconditon){
         this.streetslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street',
@@ -474,7 +474,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.areamodel.f_area_id = ''
         }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_area',
@@ -499,7 +499,7 @@
           f_filialeid: this.f_filialeids
         }
 
-        let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
+        let res = await this.$resetpost('api/af-revenue/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
         console.log('验证小区是否存在', res)
         if (res.data) {
           this.$showAlert('这个小区编号已存在！！！请核实', 'warning', 3000)
@@ -576,7 +576,7 @@
         this.buildingmodel.f_orgname = this.$login.f.orgs
         this.buildingmodel.f_depid = this.$login.f.depids
         this.buildingmodel.f_depname = this.$login.f.deps
-        await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
+        await this.$resetpost('api/af-revenue/logic/address_savebuilding', this.buildingmodel)
         this.$refs.buildinglist.search()
       },
       //保存小区
@@ -600,7 +600,7 @@
         this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
         this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
 
-        await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
+        await this.$resetpost('api/af-revenue/logic/address_updatearea', this.areamodel)
       },
       cleardara(){
         this.areamodel= {

package/src/components/AddCommunityManageMsg.vue

@@ -117,7 +117,7 @@ export default {
   methods: {
     async communityyanzheng() {
       console.log(this.communitymodel.f_community_code)
-      let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_community',
@@ -147,7 +147,7 @@ export default {
       this.streetlist = []
       console.log("街道准备")
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_street',
@@ -189,7 +189,7 @@ export default {
       this.communitymodel.f_depname = this.$login.f.deps
       this.communitymodel.f_street = this.findbyid(this.streetlist, this.communitymodel.f_street_id).f_street
       console.log('获取社区model', this.communitymodel)
-      await this.$resetpost('rs/logic/address_updateCommunityManage', this.communitymodel)
+      await this.$resetpost('api/af-revenue/logic/address_updateCommunityManage', this.communitymodel)
     },
     cancel() {
       this.clearData()

package/src/components/AddStreetManageMsg.vue

@@ -101,7 +101,7 @@ export default {
   methods: {
     async streetyanzheng() {
       console.log(this.streetmanagemodel.f_street_manage_number.length)
-      let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street_manage',
@@ -130,7 +130,7 @@ export default {
     initdata() {
       console.log("省市区准备")
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_pcd',
@@ -172,7 +172,7 @@ export default {
       this.streetmanagemodel.f_depname = this.$login.f.deps
       this.streetmanagemodel.f_pcd = this.findbyid(this.pcdslist, this.streetmanagemodel.f_pcd_id).f_pcd
       console.log('获取街道model', this.streetmanagemodel)
-      await this.$resetpost('rs/logic/address_updateStreetManage', this.streetmanagemodel)
+      await this.$resetpost('api/af-revenue/logic/address_updateStreetManage', this.streetmanagemodel)
     },
     cancel() {
       this.clearData()

package/src/components/AddStreetOrPcd.vue

@@ -150,23 +150,18 @@
     methods: {
       async streetyanzheng(){
         console.log(this.streetmodel.f_street_number.length)
-        if (this.streetmodel.f_street_number.length != 2){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.streetmodel.f_street_number = ''
-        }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_street',
-              orderitem: 'id',
-              condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res.data.length>0){
-            if (res.data[0].id != this.streetmodel.id) {
-              this.$showAlert('当前编号已存在', 'warning', 2000)
-              this.streetmodel.f_street_number = ''
-            }
+        let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: `f_street_number = '${this.streetmodel.f_street_number}' and f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        if (res.data.length>0){
+          if (res.data[0].id != this.streetmodel.id) {
+            this.$showAlert('当前编号已存在', 'warning', 2000)
+            this.streetmodel.f_street_number = ''
           }
         }
       },
@@ -176,7 +171,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.pcdmodel.f_pcd_number = ''
         }else{
-          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_pcd',
@@ -196,7 +191,7 @@
       initpcds(pconditon){
         console.log("省市区准备")
         let HttpReset = new HttpResetClass()
-        HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_pcd',
@@ -262,7 +257,7 @@
         this.pcdmodel.f_depid = this.$login.f.depids
         this.pcdmodel.f_depname = this.$login.f.deps
         this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
-        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
+        await this.$resetpost('api/af-revenue/logic/address_updatepcd', this.pcdmodel)
       },
       //保存街道
       async savestreet(){
@@ -275,7 +270,7 @@
         this.streetmodel.f_depname = this.$login.f.deps
         this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
         console.log('获取街道model', this.streetmodel)
-        await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
+        await this.$resetpost('api/af-revenue/logic/address_updatestreet', this.streetmodel)
       },
       cancel(){
         this.cleardara()

package/src/components/AddressAddAddress.vue

@@ -72,10 +72,10 @@
     //新增 || 修改
     if(val.id != null) {
       console.log("asyncAddChild=" , val)
-      result = await self.$resetpost(`rs/logic/address_addAddress`, val, {resolveMsg: null})
+      result = await self.$resetpost(`api/af-revenue/logic/address_addAddress`, val, {resolveMsg: null})
       // 添加小区 t_area
       if(val.f_type=='小区') {
-        let parent = await self.$resetpost(`rs/logic/address_parent`, {id: val.id + ""}, {resolveMsg: null})
+        let parent = await self.$resetpost(`api/af-revenue/logic/address_parent`, {id: val.id + ""}, {resolveMsg: null})
         await self.$refs.newaddressinfo.confirm(result.data.id, parent.data)
       }
     } else {
@@ -95,11 +95,11 @@
         throw err = new Error( '该地址已存在' )
       } else {
         console.log("调剂的速度val: ", val)
-        result = await self.$resetpost(`rs/logic/address_addAddress`, val, {resolveMsg: null})
+        result = await self.$resetpost(`api/af-revenue/logic/address_addAddress`, val, {resolveMsg: null})
         // 添加小区 t_area
         console.log("result=" , result)
         if(result.data && val.f_type=='小区') {
-          let parent = await self.$resetpost(`rs/logic/address_parent`, {id: result.data.id+""}, {resolveMsg: null})
+          let parent = await self.$resetpost(`api/af-revenue/logic/address_parent`, {id: result.data.id+""}, {resolveMsg: null})
           await self.$refs.newaddressinfo.confirm(result.data.id, parent.data)
         }
       }
@@ -111,9 +111,9 @@
     let data = {data: {f_parentId: null, condition: `id='${self.f_parentid}'`}}
     let result
     if(num == 1){ //添加
-      result = await self.$resetpost('rs/sql/address_getSelf', {data: {id: self.f_parentid}}, {resolveMsg: null})
+      result = await self.$resetpost('api/af-revenue/sql/address_getSelf', {data: {id: self.f_parentid}}, {resolveMsg: null})
     } else { //修改
-      result = await self.$resetpost('rs/sql/address_getParent', {data: {id: self.model.id}}, {resolveMsg: null})
+      result = await self.$resetpost('api/af-revenue/sql/address_getParent', {data: {id: self.model.id}}, {resolveMsg: null})
     }
     if(result.data.length > 0) {
       self.parent = result.data[0]
@@ -245,9 +245,9 @@
       // 添加
       async addinit(val){
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
+        let res = await http.load('POST', 'api/af-revenue/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
         this.parent = res.data.length > 0 ? res.data[0]: {}
-        let parent = await http.load('POST', `rs/logic/address_parent`, {id: val+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错！！'})
+        let parent = await http.load('POST', `api/af-revenue/logic/address_parent`, {id: val+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错！！'})
         this.areatype = parent.data.f_area
       },
       // 初始化
@@ -255,9 +255,9 @@
         let data = {data: {f_parentId: null, condition: `id='${this.f_parentid}'`}}
         let result
         if(num == 1){ //添加
-          result = await this.$resetpost('rs/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
+          result = await this.$resetpost('api/af-revenue/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
         } else { //修改
-          result = await this.$resetpost('rs/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null})
+          result = await this.$resetpost('api/af-revenue/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null})
         }
         if(result.data.length > 0) {
           this.parent = result.data[0]
@@ -345,7 +345,7 @@
               this.isselected = true
               this.$parent.showAddress = !this.$parent.showAddress
               let http = new HttpResetClass()
-              http.load('POST', 'rs/logic/address_batch', {id: id.id+"", json: batchs}, {rejectMsg:'批量上传出错', resolveMsg: '地址导入完成'}, 0).then(() => {
+              http.load('POST', 'api/af-revenue/logic/address_batch', {id: id.id+"", json: batchs}, {rejectMsg:'批量上传出错', resolveMsg: '地址导入完成'}, 0).then(() => {
                 this.$showMessage('导入完成。。！', ['confirm']).then((res) => {
                   if (res === 'confirm') {
                     this.initModel()
@@ -356,7 +356,7 @@
             }
           })
           // let http = new HttpResetClass()
-          // await http.load('POST', `rs/logic/address_batch`, {id: id.id+"", json: batchs})
+          // await http.load('POST', `api/af-revenue/logic/address_batch`, {id: id.id+"", json: batchs})
           // this.isselected = true
           // this.initModel()
           // this.$parent.showAddress = !this.$parent.showAddress
@@ -383,12 +383,12 @@
       //
       async getParent(val) {
         let http = new HttpResetClass()
-        let parent = await http.load('POST', `rs/logic/address_parent`, {id: val.id+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错！！'})
+        let parent = await http.load('POST', `api/af-revenue/logic/address_parent`, {id: val.id+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错！！'})
         this.areatype = parent.data.f_area
 
         this.model = Object.assign({}, this.model, val)
 
-        let res = await http.load('POST', 'rs/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null, rejectMsg:'请求address_getParent报错！！'})
+        let res = await http.load('POST', 'api/af-revenue/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null, rejectMsg:'请求address_getParent报错！！'})
         if(res.data.length > 0) {
           this.parent = res.data[0]
         } else {

package/src/components/AddressFiles.vue

@@ -102,7 +102,7 @@
           // 是否支持一对多
           oneToMany: false
         },
-        model: new PagedList('rs/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
+        model: new PagedList('api/af-revenue/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
         //分公司id串
         // f_filialeids: this.$login.f.orgid,
         filenums: [{label: '全部', value: ''},{label: '多表', value: '> 1'}, {label: '一表', value: '= 1'}]

package/src/components/AddressList.vue

@@ -44,7 +44,7 @@
                       @click="$parent.$parent.importAddress('完善')">完善地址</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/exportfile"
+                            sqlurl="api/af-revenue/logic/exportfile"
                             sql-name="addressGetAddress"
                             template-name='地址管理查询导出'
                             :choose-col="true"></export-excel>
@@ -257,7 +257,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
+        model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
         config: {
           // 导出列要和查询列相同
           excelHeaders: {
@@ -390,11 +390,11 @@
       async delete(row){
         if(row.id >= 0){
           var id = row.id
-          let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
+          let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
           if(userfiles.data.length){
             this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
           }else{
-            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
@@ -456,7 +456,7 @@
           f_depname: this.$login.f.deps,
           f_filialeid: this.f_filialeids
         }
-        this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
+        this.$resetpost('api/af-revenue/logic/modifyBatch',modifyBatchData)
         this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
         this.showModify = false
         this.$refs.paged.$refs.grid.selectInit()
@@ -472,7 +472,7 @@
       async initpcds(pconditon){
         this.pcdslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_pcd',
@@ -496,7 +496,7 @@
       async initstreets(pconditon){
         this.streetslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street',
@@ -519,7 +519,7 @@
       async initareas(pconditon){
         this.areaslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_area',
@@ -596,7 +596,7 @@
           type :this.imptype
         }
         console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
           this.isbusy = false
           if(res.data.type=="success"){
             this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);

package/src/components/AddressTree.vue

@@ -369,7 +369,7 @@
           id: this.f_location.f_locationId+"",
           type: this.f_location.f_locationType
         }
-        let res = await this.$resetpost(`rs/logic/address_search`, {data: {condition: condition, login: login}},{resolveMsg: null})
+        let res = await this.$resetpost(`api/af-revenue/logic/address_search`, {data: {condition: condition, login: login}},{resolveMsg: null})
         this.model = res.data
         //刷新dom
         await new Promise(resolve => {
@@ -441,7 +441,7 @@
   }
   // 导入地址
   let asyncImport = async function (self, data) {
-    let result = await self.$resetpost(`rs/logic/address_import`,data, {resolveMsg: '导入成功', rejectMsg: '导入失败', silent: true}, 0)
+    let result = await self.$resetpost(`api/af-revenue/logic/address_import`,data, {resolveMsg: '导入成功', rejectMsg: '导入失败', silent: true}, 0)
     return result
   }
   //  获取根地址
@@ -461,15 +461,15 @@
   }
   // 删除地址
   let asyncDelete = async function(self, row, type) {
-    let result = await self.$resetpost(`rs/logic/address_deleteAddress`, {childId: `${row.data.id}`}, {resolveMsg: null})
+    let result = await self.$resetpost(`api/af-revenue/logic/address_deleteAddress`, {childId: `${row.data.id}`}, {resolveMsg: null})
     if(type == '小区') {
-      await self.$resetpost(`rs/logic/address_deleteArea`,{areaId: `${row.data.id}`}, {resolveMsg: null})
+      await self.$resetpost(`api/af-revenue/logic/address_deleteArea`,{areaId: `${row.data.id}`}, {resolveMsg: null})
     }
     return result
   }
   //查询地址
   let asyncQuery = async function(self, condition, login) {
-    let result = await self.$resetpost(`rs/logic/address_query`, {data: {condition: condition, login: login}},{resolveMsg: null})
+    let result = await self.$resetpost(`api/af-revenue/logic/address_query`, {data: {condition: condition, login: login}},{resolveMsg: null})
     return result
   }
 

package/src/components/AreaFiles.vue

@@ -38,7 +38,7 @@
     title: '小区列表',
     data () {
       return {
-        model: new PagedList('rs/sql/address_getArea', 20)
+        model: new PagedList('api/af-revenue/sql/address_getArea', 20)
       }
     },
     props: ['f_filialeid'],