address-client 3.0.36-aodeToV4 → 3.0.38-aode

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Jul 10 10:01:08 CST 2020
+gradle.version=3.5

package/package.json

@@ -1,105 +1,105 @@
-{
-  "name": "address-client",
-  "version": "3.0.36-aodeToV4",
-  "description": "地址管理前台组件",
-  "author": "wanbochao",
-  "license": "ISC",
-  "main": "src/index.js",
-  "keywords": [
-    "sale"
-  ],
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/address_management.git"
-  },
-  "dependencies": {
-    "less-loader": "^2.2.3",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "axios": "0.15.3",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "ldap-clients": "3.0.28",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "1.0.66-aode",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.1.84",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.22.20-5",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "jsencrypt": "3.0.0-rc.1"
-  },
-  "directories": {
-    "doc": "doc",
-    "example": "examples",
-    "test": "test"
-  }
-}
+{
+  "name": "address-client",
+  "version": "3.0.38-aode",
+  "description": "地址管理前台组件",
+  "author": "wanbochao",
+  "license": "ISC",
+  "main": "src/index.js",
+  "keywords": [
+    "sale"
+  ],
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/address_management.git"
+  },
+  "dependencies": {
+    "less-loader": "^2.2.3",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "axios": "0.15.3",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "ldap-clients": "3.0.28",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "1.0.66-aode",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.1.84",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.22.20-5",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "jsencrypt": "3.0.0-rc.1"
+  },
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  }
+}

package/src/components/AddAreaMsg.vue

@@ -299,7 +299,7 @@
       async initSlice (val) {
         if (val) {
           this.sliceArea = [];
-          let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
+          let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
             data:{
               items: '*',
               tablename: 't_zone',
@@ -321,7 +321,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',
@@ -345,7 +345,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',
@@ -374,7 +374,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)
@@ -460,7 +460,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/AddStreetOrPcd.vue

@@ -107,7 +107,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',
@@ -173,7 +173,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(){
@@ -186,7 +186,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

@@ -42,7 +42,7 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.getfield"
                             :field="$parent.$parent.getfield"
-                            sqlurl="api/af-revenue/logic/exportfile" sql-name="address_getAddress" template-name='地址导出'
+                            sqlurl="rs/logic/addressexportfile" sql-name="address_getAddress" template-name='地址导出'
                             :choose-col="true"></export-excel>
               <button class="button_export button_spacing"  @click="$parent.$parent.importAddress">导入地址</button>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
@@ -159,7 +159,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
@@ -176,7 +176,7 @@
       return {
         iswork: false,
         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'`}),
         addflag: false,
         addtitle:'',
         condition:'',
@@ -235,8 +235,8 @@
 
       if(row.id){
         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 in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
-        let isdelete = await this.$resetpost('api/af-revenue/sql/isDeleteAddress', {data: {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 in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
+        let isdelete = await this.$resetpost('rs/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
         if(userfiles.data.length){
           this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
            return
@@ -245,7 +245,7 @@
           this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
           return
         }
-        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')
         })
       }
@@ -306,7 +306,7 @@
       }
       this.closeFile();
       try{
-        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("导入成功",'success', 2000);
           this.iswork = false
           this.init()

package/src/components/AddressTree.vue

@@ -90,7 +90,7 @@
       </header>
       <article slot="modal-body" class="modal-body">
         <div class="form-group">
-          <file-upload class="my-file-uploader" name="addressUploadFile" action="api/af-revenue/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
+          <file-upload class="my-file-uploader" name="addressUploadFile" action="rs/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer"></footer>
@@ -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

@@ -56,7 +56,7 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.getfield"
                             :field="$parent.$parent.getfield"
-                            sqlurl="api/af-revenue/logic/exportfile" sql-name="address_getarealist" template-name='小区导出'
+                            sqlurl="rs/logic/addressexportfile" sql-name="address_getarealist" template-name='小区导出'
                             :choose-col="true"></export-excel>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
             </div>
@@ -120,9 +120,11 @@
             <!--非民用单位信息结束-->
             <th><nobr>片区/管理站 </nobr></th>
             <th><nobr>使用人数 </nobr></th>
-            <th><nobr>首次通气日期 </nobr></th>
+            <th><nobr>地址数量 </nobr></th>
             <th><nobr>通气年限 </nobr></th>
-            <th><nobr>关联地址 </nobr></th>
+            <th><nobr>首次通气时间 </nobr></th>
+
+<!--            <th><nobr>关联地址 </nobr></th>-->
             <th><nobr>操作人</nobr></th>
             <th><nobr>操作日期</nobr></th>
             <th><nobr>操作</nobr></th>
@@ -155,8 +157,9 @@
             <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
             <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.id,row.f_residential_area)" class="btn btn-link">{{row.areacount}}</button></td>
             <td style="text-align:center"><nobr>{{row.addresscount}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.open_date}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.yeardiff}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.open_date}}</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>
@@ -183,7 +186,7 @@
         checkall:false,
         checkitem:[],
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getarealist',50),
+        model: new PagedList('rs/sql/address_getarealist',50),
         addflag: false,
         addtitle:'',
         condition:'',
@@ -283,7 +286,7 @@
       async delete(row){
         if(row.id){
           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',
@@ -293,7 +296,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')
             })
           }
@@ -304,7 +307,7 @@
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             //发出事件,用于建档或修正档案
-            this.$resetpost('api/af-revenue/logic/deleteAreaAll',{data:{arr:this.checkitem}}).then((res)=>{
+            this.$resetpost('rs/logic/deleteAreaAll',{data:{arr:this.checkitem}}).then((res)=>{
               this.search()
             })
           }

package/src/components/AreaTree.vue

@@ -94,7 +94,7 @@
       </header>
       <article slot="modal-body" class="modal-body">
         <div class="form-group">
-          <file-upload class="my-file-uploader" name="addressUploadFile" action="api/af-revenue/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
+          <file-upload class="my-file-uploader" name="addressUploadFile" action="rs/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer"></footer>
@@ -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')
         }
       }