address-client 3.2.105 → 3.2.106-ls

package/build/dev-server.js

@@ -3,27 +3,16 @@ 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://192.168.50.4:8400', str2= 'http://192.168.50.4:8400'
-var str3= 'http://192.168.50.4:8400'
+var str = 'http://127.0.0.1:8288/', str2= 'http://172.168.1.11:9001/#'
+var str3= 'http://172.168.1.11:9001/#'
 var proxyTable = {
-  '/api/af-auth': {
-    target: str
-  },
-  '/api/af-system': {
-    target: str
-  },
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
-  },
   '/rs/entity': {
     target: str
     // secure:true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.105",
+  "version": "3.2.106-ls",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -23,7 +23,6 @@
     "url": "https://gitee.com/aote/address_management.git"
   },
   "dependencies": {
-    "crypto-js": "^4.1.1",
     "less-loader": "^2.2.3",
     "vue": "^1.0.17"
   },
@@ -80,9 +79,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "ldap-clients": "3.0.48",
-    "system-clients": "3.2.95",
+    "system-clients": "3.2.68",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.150",
+    "vue-client": "1.24.98",
     "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', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+        let req = await HttpReset.load('POST', 'rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'rs/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('api/af-revenue/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_area',
@@ -499,7 +499,7 @@
           f_filialeid: this.f_filialeids
         }
 
-        let res = await this.$resetpost('api/af-revenue/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
+        let res = await this.$resetpost('rs/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('api/af-revenue/logic/address_savebuilding', this.buildingmodel)
+        await this.$resetpost('rs/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('api/af-revenue/logic/address_updatearea', this.areamodel)
+        await this.$resetpost('rs/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('api/af-revenue/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+      HttpReset.load('POST', 'rs/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('api/af-revenue/logic/address_updateCommunityManage', this.communitymodel)
+      await this.$resetpost('rs/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('api/af-revenue/sql/address_singleTableOrderBy', {
+      let res = await this.$resetpost('rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+      HttpReset.load('POST', 'rs/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('api/af-revenue/logic/address_updateStreetManage', this.streetmanagemodel)
+      await this.$resetpost('rs/logic/address_updateStreetManage', this.streetmanagemodel)
     },
     cancel() {
       this.clearData()

package/src/components/AddStreetOrPcd.vue

@@ -150,18 +150,23 @@
     methods: {
       async streetyanzheng(){
         console.log(this.streetmodel.f_street_number.length)
-        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 = ''
+        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 = ''
+            }
           }
         }
       },
@@ -171,7 +176,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.pcdmodel.f_pcd_number = ''
         }else{
-          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_pcd',
@@ -191,7 +196,7 @@
       initpcds(pconditon){
         console.log("省市区准备")
         let HttpReset = new HttpResetClass()
-        HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+        HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_pcd',
@@ -240,6 +245,7 @@
       async confirm(){
         if(this.areatype=='省市区'){
           await this.savepcd()
+          this.$refs.addpcd.search()
         }
         if(this.areatype=='街道'){
           await this.savestreet()
@@ -257,7 +263,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('api/af-revenue/logic/address_updatepcd', this.pcdmodel)
+        await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
       },
       //保存街道
       async savestreet(){
@@ -270,7 +276,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('api/af-revenue/logic/address_updatestreet', this.streetmodel)
+        await this.$resetpost('rs/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(`api/af-revenue/logic/address_addAddress`, val, {resolveMsg: null})
+      result = await self.$resetpost(`rs/logic/address_addAddress`, val, {resolveMsg: null})
       // 添加小区 t_area
       if(val.f_type=='小区') {
-        let parent = await self.$resetpost(`api/af-revenue/logic/address_parent`, {id: val.id + ""}, {resolveMsg: null})
+        let parent = await self.$resetpost(`rs/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(`api/af-revenue/logic/address_addAddress`, val, {resolveMsg: null})
+        result = await self.$resetpost(`rs/logic/address_addAddress`, val, {resolveMsg: null})
         // 添加小区 t_area
         console.log("result=" , result)
         if(result.data && val.f_type=='小区') {
-          let parent = await self.$resetpost(`api/af-revenue/logic/address_parent`, {id: result.data.id+""}, {resolveMsg: null})
+          let parent = await self.$resetpost(`rs/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('api/af-revenue/sql/address_getSelf', {data: {id: self.f_parentid}}, {resolveMsg: null})
+      result = await self.$resetpost('rs/sql/address_getSelf', {data: {id: self.f_parentid}}, {resolveMsg: null})
     } else { //修改
-      result = await self.$resetpost('api/af-revenue/sql/address_getParent', {data: {id: self.model.id}}, {resolveMsg: null})
+      result = await self.$resetpost('rs/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', 'api/af-revenue/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
+        let res = await http.load('POST', 'rs/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', `api/af-revenue/logic/address_parent`, {id: val+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错！！'})
+        let parent = await http.load('POST', `rs/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('api/af-revenue/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
+          result = await this.$resetpost('rs/sql/address_getSelf', {data: {id: this.f_parentid}}, {resolveMsg: null})
         } else { //修改
-          result = await this.$resetpost('api/af-revenue/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null})
+          result = await this.$resetpost('rs/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', 'api/af-revenue/logic/address_batch', {id: id.id+"", json: batchs}, {rejectMsg:'批量上传出错', resolveMsg: '地址导入完成'}, 0).then(() => {
+              http.load('POST', 'rs/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', `api/af-revenue/logic/address_batch`, {id: id.id+"", json: batchs})
+          // await http.load('POST', `rs/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', `api/af-revenue/logic/address_parent`, {id: val.id+""}, {resolveMsg: null, rejectMsg:'请求address_parent报错！！'})
+        let parent = await http.load('POST', `rs/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', 'api/af-revenue/sql/address_getParent', {data: {id: this.model.id}}, {resolveMsg: null, rejectMsg:'请求address_getParent报错！！'})
+        let res = await http.load('POST', 'rs/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('api/af-revenue/sql/address_files',30,{orderitem: `'f_create_date desc'`}),
+        model: new PagedList('rs/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="api/af-revenue/logic/exportfile"
+                            sqlurl="rs/logic/exportfile"
                             sql-name="addressGetAddress"
                             template-name='地址管理查询导出'
                             :choose-col="true"></export-excel>
@@ -257,7 +257,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
+        model: new PagedList('rs/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('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})
+          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})
           if(userfiles.data.length){
             this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
           }else{
-            this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('rs/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('api/af-revenue/logic/modifyBatch',modifyBatchData)
+        this.$resetpost('rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'rs/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', 'api/af-revenue/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_area',
@@ -596,7 +596,7 @@
           type :this.imptype
         }
         console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`rs/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(`api/af-revenue/logic/address_search`, {data: {condition: condition, login: login}},{resolveMsg: null})
+        let res = await this.$resetpost(`rs/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(`api/af-revenue/logic/address_import`,data, {resolveMsg: '导入成功', rejectMsg: '导入失败', silent: true}, 0)
+    let result = await self.$resetpost(`rs/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(`api/af-revenue/logic/address_deleteAddress`, {childId: `${row.data.id}`}, {resolveMsg: null})
+    let result = await self.$resetpost(`rs/logic/address_deleteAddress`, {childId: `${row.data.id}`}, {resolveMsg: null})
     if(type == '小区') {
-      await self.$resetpost(`api/af-revenue/logic/address_deleteArea`,{areaId: `${row.data.id}`}, {resolveMsg: null})
+      await self.$resetpost(`rs/logic/address_deleteArea`,{areaId: `${row.data.id}`}, {resolveMsg: null})
     }
     return result
   }
   //查询地址
   let asyncQuery = async function(self, condition, login) {
-    let result = await self.$resetpost(`api/af-revenue/logic/address_query`, {data: {condition: condition, login: login}},{resolveMsg: null})
+    let result = await self.$resetpost(`rs/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('api/af-revenue/sql/address_getArea', 20)
+        model: new PagedList('rs/sql/address_getArea', 20)
       }
     },
     props: ['f_filialeid'],

package/src/components/AreaList.vue

@@ -46,7 +46,7 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
-                            sqlurl="api/af-revenue/logic/exportfile"
+                            sqlurl="rs/logic/exportfile"
                             sql-name="manage_getarealist"
                             template-name='小区信息查询导出'
                             :choose-col="true"></export-excel>
@@ -191,7 +191,7 @@
       return {
         showDelete: false,
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getarealist',20),
+        model: new PagedList('rs/sql/address_getarealist',20),
         selectDataLen: 0,
         addflag: false,
         addtitle:'',
@@ -251,7 +251,7 @@
       async delete(row){
         if(row.id >= 0){
           var id = row.id
-          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
             {data: {
                 items: 'f_residential_area_id',
                 tablename: 't_user_address',
@@ -261,7 +261,7 @@
           if(useraredss.data.length>0){
             this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
@@ -332,7 +332,7 @@
         }
         let oldAreaIds = this.getRowData
         console.log('所选中的小区信息:=======' + JSON.stringify(oldAreaIds))
-        this.$resetpost('api/af-revenue/logic/batchDelete',{
+        this.$resetpost('rs/logic/batchDelete',{
           data:{
                 oldAreaIds:oldAreaIds,
                 f_operator: this.$login.f.name,

package/src/components/AreaManage.vue

@@ -66,10 +66,6 @@
           if (obj.val.f_adjustable_id != null && obj.val.f_adjustable_id != '' && !(obj.val.f_adjustable_id instanceof Array)) {
             this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id)
           }
-          if(this.$refs.addareamsg.filtName()){
-            this.$refs.addareamsg.areamodel.selladd='0'}else {
-            this.$refs.addareamsg.areamodel.selladd='1'
-          }
           // this.$refs.addareamsg.initdata(obj.val)
           // this.$refs.addareamsg.initrow(obj.val)
         }

package/src/components/AreaTree.vue

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

package/src/components/Basch.vue

@@ -59,7 +59,7 @@
             batchs.push({type: '门牌号', names: this.name_m})
           }
           console.log(batchs)
-          await this.$resetpost(`api/af-revenue/logic/address_batch`, {id: this.id, json: batchs})
+          await this.$resetpost(`rs/logic/address_batch`, {id: this.id, json: batchs})
           this.$emit('addChild')
         }
       }

package/src/components/BatchOrders.vue

@@ -140,7 +140,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getUserAddress',20,{}),
+        model: new PagedList('rs/sql/address_getUserAddress',20,{}),
         addflag: false,
         addtitle:'',
 
@@ -195,12 +195,12 @@
       async delete(row){
         if(row.id){
           var id = row.id
-          let service = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{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})
+          let service = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
+          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})
           if(service.data.length || userfiles.data.length){
             this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
@@ -244,7 +244,7 @@
           this.all = true
           console.log(this.$refs.paged.$refs.cri.condition,"=============")
           let HttpReset = new HttpResetClass()
-          await HttpReset.load('POST', 'api/af-revenue/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
+          await HttpReset.load('POST', 'rs/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
             data: {
               condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
             }
@@ -292,7 +292,7 @@
           user:this.$login.f
         }
         console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
           this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
           //关闭上传框
           this.closeFile()