address-client 3.0.37-aode → 3.0.37-aodeToV4

package/package.json

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

package/src/components/AddAreaMsg.vue

@@ -299,7 +299,7 @@
       async initSlice (val) {
         if (val) {
           this.sliceArea = [];
-          let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
+          let getAllArea = await this.$resetpost('/api/af-revenue/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', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/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', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street',
@@ -374,7 +374,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)
@@ -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('rs/logic/address_updatearea', this.areamodel)
+        await this.$resetpost('api/af-revenue/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', 'rs/sql/address_singleTableOrderBy', {
+        HttpReset.load('POST', 'api/af-revenue/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('rs/logic/address_updatepcd', this.pcdmodel)
+        await this.$resetpost('api/af-revenue/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('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

@@ -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="rs/logic/addressexportfile" sql-name="address_getAddress" template-name='地址导出'
+                            sqlurl="api/af-revenue/logic/exportfile" 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="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/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('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'`}),
         addflag: false,
         addtitle:'',
         condition:'',
@@ -235,8 +235,8 @@
 
       if(row.id){
         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 in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
-        let isdelete = await this.$resetpost('rs/sql/isDeleteAddress', {data: {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 in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
+        let isdelete = await this.$resetpost('api/af-revenue/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('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')
         })
       }
@@ -306,7 +306,7 @@
       }
       this.closeFile();
       try{
-        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.$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="rs/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
+          <file-upload class="my-file-uploader" name="addressUploadFile" action="api/af-revenue/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(`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'],

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="rs/logic/addressexportfile" sql-name="address_getarealist" template-name='小区导出'
+                            sqlurl="api/af-revenue/logic/exportfile" 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,9 @@
             <!--非民用单位信息结束-->
             <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>
@@ -154,9 +154,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.open_date}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.yeardiff}}</nobr></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.f_operator}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
             <td><nobr>
@@ -183,7 +183,7 @@
         checkall:false,
         checkitem:[],
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getarealist',50),
+        model: new PagedList('api/af-revenue/sql/address_getarealist',50),
         addflag: false,
         addtitle:'',
         condition:'',
@@ -283,7 +283,7 @@
       async delete(row){
         if(row.id){
           var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
             {data: {
               items: 'f_residential_area_id',
                 tablename: 't_user_address',
@@ -293,7 +293,7 @@
           if(useraredss.data.length>0){
             this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
@@ -304,7 +304,7 @@
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             //发出事件,用于建档或修正档案
-            this.$resetpost('rs/logic/deleteAreaAll',{data:{arr:this.checkitem}}).then((res)=>{
+            this.$resetpost('api/af-revenue/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="rs/file/uploadFile" tagname="文件导入" :headers="headers" multiple v-ref:file></file-upload>
+          <file-upload class="my-file-uploader" name="addressUploadFile" action="api/af-revenue/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(`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 => {
@@ -448,7 +448,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
   }
   //  获取根地址
@@ -468,15 +468,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/Basch.vue

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

package/src/components/BatchOrders.vue

@@ -124,7 +124,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
@@ -140,7 +140,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getUserAddress',20,{}),
+        model: new PagedList('api/af-revenue/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('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})
+          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})
           if(service.data.length || 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')
             })
           }
@@ -244,7 +244,7 @@
           this.all = true
           console.log(this.$refs.paged.$refs.cri.condition,"=============")
           let HttpReset = new HttpResetClass()
-          await HttpReset.load('POST', 'rs/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
+          await HttpReset.load('POST', 'api/af-revenue/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(`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.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
           //关闭上传框
           this.closeFile()

package/src/components/NewAddressInfo.vue

@@ -75,7 +75,7 @@
 
   let getMeterType = function * (self) {
     if (self.row) {
-      let result = yield self.$resetpost('rs/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${self.row.f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null})
+      let result = yield self.$resetpost('api/af-revenue/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${self.row.f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null})
       if (result && result.data.length > 0) {
         console.log('数据格式是神马样子的', result)
         if (result.data[0].f_meter_type === '物联网表') {
@@ -138,7 +138,7 @@
     data.f_state = '有效'
     data.f_delaypay = 0
     console.log("数据参数附属："+JSON.stringify(data))
-    let result = await self.$resetpost('rs/entity/t_area', data)
+    let result = await self.$resetpost('api/af-revenue/entity/save/t_area', data)
     // self.$dispatch('success', '新建小区成功', 'new-area-info', data)
     console.log("result=", result.data)
     self.initModel()
@@ -146,7 +146,7 @@
   }
 
   let validateAddressGen = function * (self) {
-    let areaRes = yield self.$resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_area', condition: `f_residential_area = '${self.model.f_residential_area}' and f_street = '${self.model.f_street}'`}}, {resolveMsg: null, rejectMsg: '验证小区，查询出错！！！！'})
+    let areaRes = yield self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_area', condition: `f_residential_area = '${self.model.f_residential_area}' and f_street = '${self.model.f_street}'`}}, {resolveMsg: null, rejectMsg: '验证小区，查询出错！！！！'})
     console.log('查询出的小区,,,', areaRes)
     if (areaRes.data.length > 0) {
       self.$showAlert('小区已存在, 请重新输入', 'danger', 0)
@@ -191,7 +191,7 @@
       // 'model.f_meter_brand' (val) {
       //   console.log('val里面是神马', val)
       //   if (val && val.length > 0) {
-      //     this.$resetpost('rs/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${val[0].f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //     this.$resetpost('api/af-revenue/sql/querySingleTable', {data: {items: 'f_meter_type', tablename: 't_gasbrand', condition: `f_meter_brand = '${val[0].f_meter_brand}'`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
       //       console.log('res是神马呀', res)
       //       if (res.data[0].f_meter_type === '物联网表') {
       //         this.viewsee = true

package/src/components/OneCodeList.vue

@@ -205,7 +205,7 @@
   export default {
     data() {
       return {
-        model: new PagedList('rs/sql/address_singleTableOrderBy', 20,{
+        model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy', 20,{
           tablename: `'t_code_contract'`,items: `'*'`,
           orderitem: `'id '`})
       }

package/src/components/StreetList.vue

@@ -101,7 +101,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getstreetlist',20),
+        model: new PagedList('api/af-revenue/sql/address_getstreetlist',20),
         addflag: false,
         addtitle:'',
 
@@ -131,7 +131,7 @@
       async delete(row){
         if(row.id){
           var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
             {data: {
                 items: 'f_street_id',
                 tablename: 't_area',
@@ -141,7 +141,7 @@
           if(useraredss.data.length>0){
             this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
           }else{
-            this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('api/af-revenue/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }

package/src/components/UserAddress.vue

@@ -66,25 +66,24 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_building.required ? 'has-error' : 'has-success']">
+          <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
-                   placeholder="楼号"  v-validate:f_building='{required: true }'/>
+                   placeholder="楼号"/>
             <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
             />
 
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_unit.required ? 'has-error' : 'has-success']">
+          <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
-            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"
-                   v-validate:f_unit='{required: true }' />
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
             <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group "  :class="[$v.f_floor.required ? 'has-error' : 'has-success']">
+          <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
-                   placeholder="楼层"  v-validate:f_floor='{required: true }' />
+                   placeholder="楼层" />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />
           </div>
@@ -392,7 +391,7 @@
   async initAreas (val) {
     if (val) {
       this.sliceArea = [];
-      let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
+      let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
         data:{
           items: '*',
           tablename: 't_zone',
@@ -412,7 +411,7 @@
   async initpcds(pconditon){
     this.pcdslist = []
     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_pcd',
@@ -435,7 +434,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',
@@ -461,7 +460,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',
@@ -649,7 +648,7 @@
       }
       this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-        this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
+        this.$resetpost('api/af-revenue/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
           this.cleardara()
           this.$dispatch('confirm')
         })
@@ -697,7 +696,7 @@
       this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
       this.model.f_address = this.model.f_street + this.model.f_residential_area +  (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
     }
-    await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
+    await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.model)
   },
   cancel(){
     this.cleardara()

package/src/components/UserAddressChange.vue

@@ -35,7 +35,7 @@
     title: '地址变更列表',
     data () {
       return {
-        model: new PagedList('rs/sql/address_singleTableOrderBy',20, {
+        model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy',20, {
           tablename: `'t_address_change'`,items: `'*'`,
           orderitem: `'f_operate_date desc'`}),
       }

package/src/components/addressts/AddressListts.vue

@@ -155,7 +155,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
@@ -172,7 +172,7 @@
       return {
         iswork: false,
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getAddress_ts',20,{tablename: `'t_user_address_ts'`,items: `'*'`,orderitem: `'id desc'`}),
+        model: new PagedList('api/af-revenue/sql/address_getAddress_ts',20,{tablename: `'t_user_address_ts'`,items: `'*'`,orderitem: `'id desc'`}),
         addflag: false,
         addtitle:'',
 
@@ -231,8 +231,8 @@
 
       if(row.id){
         var id = row.id
-        let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles_ts',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})
+        let userfiles = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles_ts',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})
         if(userfiles.data.length){
           this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
            return
@@ -241,7 +241,7 @@
         //   this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
         //   return
         // }
-        this.$resetdelete('rs/entity/t_user_address_ts', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$resetdelete('api/af-revenue/entity/t_user_address_ts', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
           this.$dispatch('cancel')
         })
       }
@@ -290,7 +290,7 @@
       }
       this.closeFile();
       try{
-        await this.$resetpost(`rs/logic/address_useraddressimport_ts`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport_ts`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
           this.$showAlert("导入成功",'success', 2000);
           this.iswork = false
           this.init()

package/src/components/addressts/UserAddressChangets.vue

@@ -35,7 +35,7 @@
     title: '地址变更列表',
     data () {
       return {
-        model: new PagedList('rs/sql/address_singleTableOrderBy',20, {
+        model: new PagedList('api/af-revenue/sql/address_singleTableOrderBy',20, {
           tablename: `'t_address_change_ts'`,items: `'*'`,
           orderitem: `'f_operate_date desc'`}),
       }

package/src/components/addressts/UserAddressts.vue

@@ -66,25 +66,24 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_building.required ? 'has-error' : 'has-success']">
+          <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
-                   placeholder="楼号"  v-validate:f_building='{required: true }'/>
+                   placeholder="楼号"/>
             <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
             />
 
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group " :class="[$v.f_unit.required ? 'has-error' : 'has-success']">
+          <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
-            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"
-                   v-validate:f_unit='{required: true }' />
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
             <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group "  :class="[$v.f_floor.required ? 'has-error' : 'has-success']">
+          <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
-                   placeholder="楼层"  v-validate:f_floor='{required: true }' />
+                   placeholder="楼层" />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />
           </div>
@@ -352,7 +351,7 @@
   async initAreas (val) {
     if (val) {
       this.sliceArea = [];
-      let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
+      let getAllArea = await this.$resetpost('/api/af-revenue/sql/address_singleTableOrderBy', {
         data:{
           items: '*',
           tablename: 't_zone',
@@ -372,7 +371,7 @@
   async initpcds(pconditon){
     this.pcdslist = []
     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_pcd',
@@ -395,7 +394,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',
@@ -421,7 +420,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',
@@ -608,7 +607,7 @@
       }
       this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-        this.$resetpost('rs/logic/address_adduserlist_ts',{data: {addlist:this.addresslist}},msg).then((req) => {
+        this.$resetpost('api/af-revenue/logic/address_adduserlist_ts',{data: {addlist:this.addresslist}},msg).then((req) => {
           this.cleardara()
           this.$dispatch('confirm')
         })
@@ -656,7 +655,7 @@
       this.model.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
       this.model.f_address = this.model.f_street + this.model.f_residential_area +  (this.model.f_building?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
     }
-    await this.$resetpost('rs/logic/address_updateuseraddress_ts', this.model)
+    await this.$resetpost('api/af-revenue/logic/address_updateuseraddress_ts', this.model)
   },
   cancel(){
     this.cleardara()

package/src/components/areauser/AreaUser.vue

@@ -104,7 +104,7 @@
     title: '小区使用人',
     data () {
       return {
-         model: new PagedList('rs/sql/getareauser', 20, {}),
+         model: new PagedList('api/af-revenue/sql/getareauser', 20, {}),
         condition:'',
         getfield: {},
         show:false,
@@ -128,7 +128,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',
@@ -177,7 +177,7 @@
           f_residential_area_id:this.newinfo.residential_id
         }
 
-        let res =  await this.$resetpost('rs/logic/changeareaUser', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+        let res =  await this.$resetpost('api/af-revenue/logic/changeareaUser', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
         this.$showMessage(`成功批量修改了${res.data}位用户的小区`)
         this.criteriaShow = false
         this.close()

package/src/components/selectAddress/BatchList.vue

@@ -32,8 +32,8 @@
             </div>
             <div class="span" style="float:right;">
               <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button class="button_new button_spacing"  style="width:70px" @click="$parent.$parent.add('民用')">添加民用</button>
-              <button class="button_new button_spacing" style="width:100px" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
+              <button class="button_new button_spacing"  style="width:100px" @click="$parent.$parent.add('民用')">添加民用</button>
+              <button class="button_new button_spacing" style="width:120px" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
               <button class="button_search button_spacing" @click="$parent.$parent.submit()" >确定</button>
               <button class="button_search button_spacing" @click="$parent.$parent.cancel()" >取消</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>
@@ -112,7 +112,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
@@ -121,206 +121,209 @@
 </template>
 
 <script>
-  import { PagedList } from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
+import { PagedList } from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-  export default {
-    data () {
-      return {
-        criteriaShow: false,
-        model: new PagedList('rs/sql/address_getUserAddress',15,{}),
-        addflag: false,
-        addtitle:'',
+export default {
+  data () {
+    return {
+      criteriaShow: false,
+      model: new PagedList('api/af-revenue/sql/address_getUserAddress',15,{
+        f_filiale_id:'this.f_filiale_id'
+      }),
+      addflag: false,
+      addtitle:'',
 
-        all: false,
-        //row数据
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
+      all: false,
+      //row数据
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
 
-        //文件上传弹框
-        showFile: false,
-        rowsdata:[],
-        selecteddata:[],
-        length:99999999
+      //文件上传弹框
+      showFile: false,
+      rowsdata:[],
+      selecteddata:[],
+      length:99999999
+    }
+  },
+  title: '地址列表',
+  props:{
+    f_filialeids:{
+      type: String
+    },
+    clear:{
+      default:false
+    }
+  },
+  ready(){
+    this.search()
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+
+    //添加方法
+    add(val){
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add',val)
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
       }
     },
-    title: '地址列表',
-    props:{
-      f_filialeids:{
-        type: String
-      },
-      clear:{
-        default:false
+    importAddress(){
+      this.showFile = true
+    },
+    // 关闭文件上传对话框
+    closeFile() {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+    },
+    //修改
+    modify(val){
+      this.$refs.paged.$refs.grid.selectStore.selected = null
+      this.$dispatch('modify',val)
+    },
+    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})
+        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.$dispatch('cancel')
+          })
+        }
       }
     },
-    ready(){
-      this.search()
+
+    search () {
+      this.$refs.paged.$refs.cri.search()
     },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
 
-      //添加方法
-      add(val){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add',val)
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-      },
-      importAddress(){
-        this.showFile = true
-      },
-      // 关闭文件上传对话框
-      closeFile() {
-        this.showFile = false
-        // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-      },
-      //修改
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          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('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
+    async selfSearch (args) {
+      this.selecteddata = []
+      this.rowsdata = []
+      this.all = false
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      console.log('查询。。。', this.f_orgid)
+
+      args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+      await this.model.search(args.condition, args.model)
+      this.length = this.model.count
+      console.log(this.length,"============")
+    },
 
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
+    //清空
+    clear(){
+      this.$refs.paged.$refs.cri.model = {}
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+      this.model.f_filiale_id = val[0]
+    },
 
-      async selfSearch (args) {
+    async select() {
+      if(this.all){
         this.selecteddata = []
         this.rowsdata = []
         this.all = false
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-        console.log('查询。。。', this.f_orgid)
-
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
-        await this.model.search(args.condition, args.model)
-        this.length = this.model.count
-        console.log(this.length,"============")
-      },
-
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
-      },
-
-      async select() {
-        if(this.all){
+        this.length = 99999999
+      }else {
+        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', {
+          data: {
+            condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
+          }
+        }, {resolveMsg: null, rejectMsg: '全选获取数据异常，请重试!'}).then((req) => {
           this.selecteddata = []
           this.rowsdata = []
-          this.all = false
-          this.length = 99999999
-        }else {
-          this.all = true
-          console.log(this.$refs.paged.$refs.cri.condition,"=============")
-          let HttpReset = new HttpResetClass()
-          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}' `
+          req.data.forEach((row, n) => {
+            console.log(row.state,"===========")
+            if(row.state === 'true'){
+              this.selecteddata.push(row.id)
+              this.rowsdata.push({
+                id: row.id,
+                name:row.f_address
+              })
             }
-          }, {resolveMsg: null, rejectMsg: '全选获取数据异常，请重试!'}).then((req) => {
-            this.selecteddata = []
-            this.rowsdata = []
-            req.data.forEach((row, n) => {
-              console.log(row.state,"===========")
-              if(row.state === 'true'){
-                this.selecteddata.push(row.id)
-                this.rowsdata.push({
-                  id: row.id,
-                  name:row.f_address
-                })
-              }
-            })
           })
-        }
-      },
-      selectOne(event, row, i) {
-        if(this.all){
-          this.all = !this.all
-        }
-        if (event.target.checked) {
-          this.selecteddata.push(row.id)
-          this.rowsdata.push({id:row.id,name:row.f_address})
-          if(this.length === this.selecteddata.length){
-            this.all = true
-          }
-        } else {
-          this.all = false
-          this.selecteddata.splice(this.selecteddata.indexOf(row.id),1)
-          this.rowsdata.splice(parseInt(this.selecteddata.indexOf(row.id)),1)
-        }
-      },
-      submit(){
-        console.log('提交信息', this.rowsdata)
-        this.$emit('submit',this.rowsdata)
-      },
-      cancel () {
-        this.$emit('cancel')
+        })
       }
     },
-    events: {
-      onFileUpload: async function (file, res) {
-        console.log("上传完毕"+JSON.stringify(res))
-        let data = {
-          filepath: res.f_downloadpath,
-          user:this.$login.f
+    selectOne(event, row, i) {
+      if(this.all){
+        this.all = !this.all
+      }
+      if (event.target.checked) {
+        this.selecteddata.push(row.id)
+        this.rowsdata.push({id:row.id,name:row.f_address})
+        if(this.length === this.selecteddata.length){
+          this.all = true
         }
-        console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
-          this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
-          //关闭上传框
-          this.closeFile()
-          //重新查询
-          this.init()
-        })
-      },
-      'onFileError'(error) {
-        this.$showAlert(error, 'warning', 2000)
+      } else {
+        this.all = false
+        this.selecteddata.splice(this.selecteddata.indexOf(row.id),1)
+        this.rowsdata.splice(parseInt(this.selecteddata.indexOf(row.id)),1)
       }
     },
-    computed: {
-      ischecked(){
-        return function (row) {
-          return this.all||this.selecteddata.includes(row.id)
-        }
-      },
-      isall(){
-        return function () {
-          return this.all
-        }
+    submit(){
+      console.log('提交信息', this.rowsdata)
+      this.$emit('submit',this.rowsdata)
+    },
+    cancel () {
+      this.$emit('cancel')
+    }
+  },
+  events: {
+    onFileUpload: async function (file, res) {
+      console.log("上传完毕"+JSON.stringify(res))
+      let data = {
+        filepath: res.f_downloadpath,
+        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)=>{
+        this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
+        //关闭上传框
+        this.closeFile()
+        //重新查询
+        this.init()
+      })
     },
-    watch:{
-      clear(val){
-        if(val){
-          this.search()
-        }
+    'onFileError'(error) {
+      this.$showAlert(error, 'warning', 2000)
+    }
+  },
+  computed: {
+    ischecked(){
+      return function (row) {
+        return this.all||this.selecteddata.includes(row.id)
+      }
+    },
+    isall(){
+      return function () {
+        return this.all
+      }
+    }
+  },
+  watch:{
+    clear(val){
+      if(val){
+        this.search()
       }
     }
-
   }
+
+}
 </script>