sale-client 3.6.375-preview → 3.6.375

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Aug 22 10:59:01 CST 2024
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://192.168.50.67:30785/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,17 +20,21 @@ var devConfig = {
     },
     proxy: {
       '/api': {
-        target: 'http://192.168.50.67:31567'
+        target: v4Url
+      },
+      '/sketch': {
+        target: serverRul,
+        changeOrigin: true
       },
       '/invoice/rs/logic/getInvoice': {
         target: serverRul
       },
-      '/rs/sql/filemanage_getUserfies': {
-        target: 'http://127.0.0.1:8080/'
-      },
-      '/rs/logic/importNetworkValve': {
-        target: 'http://127.0.0.1:8080/'
-      },
+      // '/rs/sql/filemanage_getUserfies':{
+      //   target: 'http://127.0.0.1:8080/'
+      // },
+      // '/rs/logic/importNetworkValve':{
+      //   target: 'http://127.0.0.1:8080/'
+      // },
       '/rs/file': {
         target: localUrl
       },

package/build/versionCheck.js

@@ -17,11 +17,11 @@ const checkVersion = () => {
   const {devDependencies} = pkg
   if (devDependencies && devDependencies['system-clients']) {
     if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
-      console.log('\x1b[43m\x1b[1m\x1b[30m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
-      console.log('\x1b[43m\x1b[1m\x1b[30m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
-      console.log('\x1b[43m\x1b[1m\x1b[30m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
-      console.log('\x1b[43m\x1b[1m\x1b[30m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
-      console.log('\x1b[43m\x1b[1m\x1b[30m%s\x1b[0m', '请查看营收后台升级日志：http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请查看营收后台升级日志：http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.375-preview",
+  "version": "3.6.375",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,11 +24,11 @@
     "qrcodejs2": "^0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.25.3",
+    "vue-client": "1.24.162",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.105",
+    "address-client": "3.2.105-yangchun",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -75,7 +75,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.62",
+    "ldap-clients": "3.0.96",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -90,7 +90,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.61",
+    "system-clients": "3.3.2",
     "url-loader": "^0.5.7",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",

package/src/components/FilesManage/AddHostMeterUserList.vue

@@ -138,7 +138,7 @@ export default {
       operateShow: false,
       showOptional: false,
       batchUpdateAreaShow: false,
-      model: new PagedList('api/af-revenue/sql/sale_getUnboundHostMeter', 20)
+      model: new PagedList('rs/sql/sale_getUnboundHostMeter', 20)
     }
   },
   title: '添加总表用户档案列表',

package/src/components/FilesManage/AddSubMeterUserList.vue

@@ -131,7 +131,7 @@ export default {
       operateShow: false,
       showOptional: false,
       batchUpdateAreaShow: false,
-      model: new PagedList('api/af-revenue/sql/sale_getHostMeterAllUser', 20)
+      model: new PagedList('rs/sql/sale_getHostMeterAllUser', 20)
     }
   },
   title: '添加总表用户档案列表',

package/src/components/FilesManage/Edit.vue

@@ -26,7 +26,7 @@ export default {
   },
   ready () {
     if (this.row) {
-      new HttpResetClass().load('POST', 'api/af-revenue/sql/tel_singleTable_OrderBy', {
+      new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {
         data: {
           items: 'blob', tablename: 't_blob_sketch', condition: `id  = '${this.row}'`, orderitem: 'id'
         }
@@ -35,7 +35,7 @@ export default {
           this.handleClick()
           return
         }
-        let resDataUserfiles = await new HttpResetClass().load('POST', 'api/af-revenue/sql/tel_singleTable_OrderBy', {
+        let resDataUserfiles = await new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {
           data: {
             items: '*', tablename: 't_userfiles', condition: `f_userinfo_id = '${this.row}'`, orderitem: ' f_userfiles_id desc '
           }
@@ -106,7 +106,7 @@ export default {
           title: param.title,
           f_userinfo_id: this.row
         }
-        new HttpResetClass().load('POST', 'api/af-revenue/logic/savePaperEdit', {data: reqdata}).then(res => {
+        new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata}).then(res => {
           if (res.data.code === 200) {
             this.$showMessage('保存成功')
           } else {

package/src/components/FilesManage/FileAddressList.vue

@@ -48,7 +48,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>
@@ -62,7 +62,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getAddress', 20, {}),
+        model: new PagedList('rs/sql/address_getAddress', 20, {}),
         addflag: false,
         addtitle: '',
 

package/src/components/FilesManage/FileMergeInfo.vue

@@ -53,7 +53,7 @@
           beforeinfo: this.mergeinfo.data,
           afterinfo: row
         }
-        let res = await this.$resetpost('api/af-revenue/logic/filemanage_mergeuser', {data: datas}, {resolveMsg: null, rejectMsg: '合并档案失败'})
+        let res = await this.$resetpost('rs/logic/filemanage_mergeuser', {data: datas}, {resolveMsg: null, rejectMsg: '合并档案失败'})
         /* let res = {
           data: {
             oldcode : ['001','002'],

package/src/components/FilesManage/FileUserAddress.vue

@@ -368,7 +368,7 @@
         // this.model.f_residential_area_id = null
         // this.model.f_residential_area = null
         let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and  a.f_orgid = '${this.$login.f.orgid}'`
-        let req = await this.$resetpost('api/af-revenue/sql/address_getresidential', {
+        let req = await this.$resetpost('rs/sql/address_getresidential', {
           data: {
             condition: condition
           }
@@ -416,7 +416,7 @@
       async initpcds (pconditon) {
         this.pcdslist = []
         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_pcd',
@@ -439,7 +439,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',
@@ -465,7 +465,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',
@@ -648,7 +648,7 @@
           }
           this.$showMessage('确定要批量添加' + this.addresslist.length + '户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-revenue/logic/address_adduserlist', {data: {addlist: this.addresslist}}, msg).then((req) => {
+              this.$resetpost('rs/logic/address_adduserlist', {data: {addlist: this.addresslist}}, msg).then((req) => {
                 this.cleardara()
                 this.$dispatch('confirm')
               })
@@ -697,7 +697,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('api/af-revenue/logic/address_updateuseraddress', this.model)
+        await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
       },
       cancel () {
         this.cleardara()

package/src/components/FilesManage/FileUserAddressChange.vue

@@ -52,7 +52,7 @@
         if (this.address_id) {
           data.condition = `f_address_id = '${this.address_id}'`
         }
-        let res = await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {data: data}, {rejectMsg: '获取地址变更记录出错', resolveMsg: null})
+        let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {data: data}, {rejectMsg: '获取地址变更记录出错', resolveMsg: null})
         this.model.rows = res.data
       }
     },

package/src/components/FilesManage/FileUserFiles.vue

@@ -459,14 +459,14 @@
     <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
         <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
-                     action="api/af-revenue/file/uploadFile" tagname="导入档案" v-ref:file :headers="headers"></file-upload>
+                     action="rs/file/uploadFile" tagname="导入档案" v-ref:file :headers="headers"></file-upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
     <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="api/af-revenue/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
         <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
         </button>
       </article>
@@ -533,7 +533,7 @@ let loadParamGem = async function (self) {
     if (areainfo.file_num > 0 && !areainfo.f_userinfo_id) {
       // 完善
       // 将表档案信息带入，完善客户信息
-      let getMetersInfo = await self.$resetpost('api/af-revenue/logic/sale_getMeterByAddress', {
+      let getMetersInfo = await self.$resetpost('rs/logic/sale_getMeterByAddress', {
         data: {
           f_useraddress_id: areainfo.id
         }
@@ -542,7 +542,7 @@ let loadParamGem = async function (self) {
     }
     if (areainfo.file_num > 0 && areainfo.f_userinfo_id) {
       // 添加 将客户信息带入
-      let getUserinfo = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {
+      let getUserinfo = await self.$resetpost('rs/sql/saleSingleTable', {
         data: {
           tablename: 't_userinfo',
           condition: `f_userinfo_id = '${areainfo.f_userinfo_id}'`
@@ -565,7 +565,7 @@ let loadParamGem = async function (self) {
           hasLimit: true
         },
         bacthPin: '',
-        model: new PagedList('api/af-revenue/sql/filemanage_getUserfies', 30, {orderitem: '"f_userinfo_id DESC"'}),
+        model: new PagedList('rs/sql/filemanage_getUserfies', 30, {orderitem: '"f_userinfo_id DESC"'}),
         row: null, // 选择一条客户信息，对其进行修改
         areainfo: null, // 小区批量建档使用的数据
         rows: [], // 客户档案选择一条时，将只显示一条信息，rows用来存放整页的数据
@@ -632,7 +632,7 @@ let loadParamGem = async function (self) {
         clientWidth: document.body.clientWidth,
         batchMeterShow: false,
         billData: {
-          url: 'api/af-revenue/report/userignition',
+          url: 'rs/report/userignition',
           bill: ''
         },
         configs: {
@@ -682,7 +682,7 @@ let loadParamGem = async function (self) {
 
       },
       downloadFiles(){
-        let downurl='api/af-revenue/downloadfile/file?filename=批量建档导出Excel模板';
+        let downurl='rs/downloadfile/file?filename=批量建档导出Excel模板';
         this.$downFile(downurl,'批量建档导出Excel模板.xlsx')
       },
       /**
@@ -814,7 +814,7 @@ let loadParamGem = async function (self) {
               infoIds.push(item)
               count++
             })
-            await this.$resetpost('api/af-revenue/logic/saveCancellation', {infoIds: infoIds}, {resolveMsg: null, rejectMsg: '批量销户失败'}).then((res) => {
+            await this.$resetpost('rs/logic/saveCancellation', {infoIds: infoIds}, {resolveMsg: null, rejectMsg: '批量销户失败'}).then((res) => {
               if(res && res.data){
                 this.$showMessage(`本次批量销户总计:  ${res.data.allnum}户  ,成功:  ${res.data.successnum}户  ,失败(已经销户):  ${res.data.errornum2}  户,失败(待审核):  ${res.data.errornum1}户 `);
               }
@@ -982,7 +982,7 @@ let loadParamGem = async function (self) {
           tablename: 't_userinfo',
           filepath: res.path
         }
-        this.$resetpost('api/af-revenue/logic/import', data, {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
+        this.$resetpost('rs/logic/import', data, {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
           this.close()
           this.$showAlert(`一共上传${res.data.total}条数据, 成功${res.data.successnum}条`, 'success', 2000)
           this.search()
@@ -1003,7 +1003,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await axios.post('rs/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
@@ -1046,7 +1046,7 @@ let loadParamGem = async function (self) {
             f_depid: this.$login.f.depids,
             f_depname: this.$login.f.deps
           }
-          this.$resetpost('api/af-revenue/logic/sale_userfilesImp', {data: data}, {
+          this.$resetpost('rs/logic/sale_userfilesImp', {data: data}, {
             resolveMsg: null,
             rejectMsg: '上传失败'
           }).then((res) => {

package/src/components/FilesManage/FileUserMerge.vue

@@ -119,7 +119,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('api/af-revenue/sql/filemanage_getmergeuser', 20, {}),
+        model: new PagedList('rs/sql/filemanage_getmergeuser', 20, {}),
         selecteddata: {
           data: []
         },

package/src/components/FilesManage/HostMeterAdd.vue

@@ -154,7 +154,7 @@ export default {
         condition = condition + ` `
       }
       let HttpReset = new HttpResetClass()
-      HttpReset.load('POST', 'api/af-revenue/sql/sale_getUnboundHostMeter?pageNo=1&pageSize=100', {
+      HttpReset.load('POST', 'rs/sql/sale_getUnboundHostMeter?pageNo=1&pageSize=100', {
         data: {
           condition: condition
         }
@@ -180,7 +180,7 @@ export default {
       this.model.f_depid = this.$login.f.depids
       this.model.f_depname = this.$login.f.deps
       console.log('保存数据之前', this.model)
-      await this.$resetpost('api/af-revenue/logic/sale_hostMeterFileSave', this.model)
+      await this.$resetpost('rs/logic/sale_hostMeterFileSave', this.model)
       this.$dispatch('confirm')
     },
     cancel () {

package/src/components/FilesManage/HostMeterList.vue

@@ -195,7 +195,7 @@ export default {
   data () {
     return {
       criteriaShow: false,
-      model: new PagedList('api/af-revenue/sql/sale_getHostMeterList', 20, {}),
+      model: new PagedList('rs/sql/sale_getHostMeterList', 20, {}),
       gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
       meter_classify: this.$appdata.getParam('气表类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')] : [],
       user_type: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],

package/src/components/FilesManage/HostMeterUserList.vue

@@ -149,7 +149,7 @@ export default {
       selectRow: null,
       operateShow: false,
       batchUpdateAreaShow: false,
-      model: new PagedList('api/af-revenue/sql/sale_getHostMeterAllUser', 6)
+      model: new PagedList('rs/sql/sale_getHostMeterAllUser', 6)
     }
   },
   title: '总表子表列表',
@@ -204,7 +204,7 @@ export default {
             f_depname: this.$login.f.deps,
             hostMeter: this.data
           }
-          await this.$resetpost('api/af-revenue/logic/sale_batchMoveUserInHostMeter', {data: data}, msg)
+          await this.$resetpost('rs/logic/sale_batchMoveUserInHostMeter', {data: data}, msg)
           this.search()
         }
       })
@@ -228,7 +228,7 @@ export default {
             f_depname: this.$login.f.deps
           }
           this.closeModal()
-          await this.$resetpost('api/af-revenue/logic/sale_removeUserByHostMeter', {data: data}, msg)
+          await this.$resetpost('rs/logic/sale_removeUserByHostMeter', {data: data}, msg)
           this.search()
         }
       })

package/src/components/FilesManage/MeterinfoTest.vue

@@ -264,14 +264,10 @@
                v-show="(formconfig && formconfig.f_use_limit && formconfig.f_use_limit.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_use_limit')">
             <label class="font_normal_body">表具使用年限</label>
-<!--            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"-->
-<!--                   v-validate:f_use_limit=getConfigValidate("f_use_limit",false)-->
-<!--                   :value.sync="row.f_use_limit"-->
-<!--                   placeholder='表具使用年限' >-->
-            <v-select :value.sync="row.f_use_limit?row.f_use_limit:'10'" :options='uselimit'
-                      :placeholder="getConfigPlaceholder('f_use_limit','使用年限')"
-                      close-on-select
-                      v-model='row.f_use_limit'></v-select>
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   v-validate:f_use_limit=getConfigValidate("f_use_limit",false)
+                   :value.sync="row.f_use_limit"
+                   placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_gas_person.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_gas_person && formconfig.f_gas_person.required) || !onlyshowmust"
@@ -642,7 +638,7 @@
       condition: `f_book_state='有效' and f_filiale_id='${self.$login.f.orgid}'`
     }
     let http = new HttpResetClass()
-    let meterbooks = yield http.load('POST', 'api/af-revenue/sql/saleSingleTable', {data: temp},
+    let meterbooks = yield http.load('POST', 'rs/sql/saleSingleTable', {data: temp},
       {resolveMsg: null, rejectMsg: '获取抄表册信息失败！！'})
     if (meterbooks.data.length > 0) {
       let options = []
@@ -667,21 +663,21 @@
     let beforeRecord = null
 
     if (self.meter.f_meter_classify === '机表') {
-      beforeRecord = yield self.$resetpost('api/af-revenue/sql/saleSingleTable', {
+      beforeRecord = yield self.$resetpost('rs/sql/saleSingleTable', {
         data: {
           tablename: 't_handplan',
           condition: `f_user_id = '${self.row.f_user_id}' and f_meter_state in ('已抄表','未抄表')`
         }
       }, {resolveMsg: null, rejectMsg: '在档案中更改气表品牌时，获取之前机表抄表信息出错！！'})
     } else if (self.meter.f_meter_classify === '物联网表') {
-      beforeRecord = yield self.$resetpost('api/af-revenue/sql/saleSingleTable', {
+      beforeRecord = yield self.$resetpost('rs/sql/saleSingleTable', {
         data: {
           tablename: 't_instruct',
           condition: `f_user_id = '${self.row.f_user_id}'`
         }
       }, {resolveMsg: null, rejectMsg: '在档案中更改气表品牌时，获取之前机表抄表信息出错！！'})
     } else {
-      beforeRecord = yield self.$resetpost('api/af-revenue/sql/saleSingleTable', {
+      beforeRecord = yield self.$resetpost('rs/sql/saleSingleTable', {
         data: {
           tablename: 't_sellinggas',
           condition: `f_user_id = '${self.row.f_user_id}' and f_state = '有效'`
@@ -724,7 +720,6 @@
         usetype: this.$appdata.getParam('使用类型'),
         usestate: this.$appdata.getParam('使用状态'),
         aroundmeters: this.$appdata.getParam('左右表'),
-        uselimit: this.$appdata.getParam('表具使用年限'),
         forceMeasure: this.$appdata.getParam('三项强制措施'),
         garbagefee: this.$appdata.getParam('垃圾费'),
         valvestate: this.$appdata.getParam('阀门状态'),
@@ -826,7 +821,7 @@
         }
       },
       checkCardId () {
-        this.$resetpost('api/af-revenue/logic/checkCardId', {
+        this.$resetpost('rs/logic/checkCardId', {
           data: {
             f_userfiles_id: this.row.f_userfiles_id,
             gasbrandId: this.row.f_gasbrand_id,
@@ -857,7 +852,7 @@
           condition: `f_mpc_state !='删除'`,
           orderitem: 'id'
         }
-        let data = await this.$resetpost('api/af-revenue/sql/saleSingleTable', {data: condition}, {resolveMsg: null, rejectMsg: '获取集中器失败!'})
+        let data = await this.$resetpost('rs/sql/saleSingleTable', {data: condition}, {resolveMsg: null, rejectMsg: '获取集中器失败!'})
         this.concentrators = []
         for (let row of data.data) {
           this.concentrators.push({label: row.f_mpc_alias, value: row.id})
@@ -866,7 +861,7 @@
       async confirmUserfiles () {
         if (this.$refs.addparamlist.confirm()) {
           var paramlist = this.$refs.addparamlist.addGasParameter
-          await this.$resetpost('api/af-revenue/logic/updateGasParam', {
+          await this.$resetpost('rs/logic/updateGasParam', {
             data: {
               id: this.selectUserFiles.f_user_id,
               paramlist: paramlist,
@@ -951,7 +946,7 @@
       },
       async meternumberValidate () {
         let http1 = new HttpResetClass()
-        let res1 = await http1.load('POST', '/api/af-revenue/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
         if (res1.data.length > 0) {
           // 替换表号自带的气表品牌和型号
           let meterbrands = this.meterbrands
@@ -999,11 +994,10 @@
           if (this.row.f_userfiles_id) {
             param.f_userfiles_id = this.row.f_userfiles_id
           }
-          let res = await this.$resetpost('api/af-revenue/logic/meternumberValidate', param, {
+          let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
             resolveMsg: null,
             rejectMsg: '表号验证失败！！'
           })
-          console.log("res=====",res)
           if (this.row.gasbrand[0].f_meter_type === '物联网表') {
             if (res.data) {
               this.row.f_meternumber = ''

package/src/components/FilesManage/TemplateManage.vue

@@ -63,7 +63,7 @@
         </div>
         <file-upload class="my-file-uploader" name="my-file"
                      accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
-                     action="api/af-revenue/file/uploadFile" :headers="headers" tagname="确定" v-ref:file>
+                     action="rs/file/uploadFile" :headers="headers" tagname="确定" v-ref:file>
         </file-upload>
       </article>
       <footer slot="modal-footer" style="display: none">
@@ -82,7 +82,7 @@
     title: '模板管理',
     data () {
       return {
-        model: new PagedList('api/af-revenue/sql/singleTable_OrderBy', 8, {
+        model: new PagedList('rs/sql/singleTable_OrderBy', 8, {
           items: '"*"',
           tablename: '"t_files"',
           orderitem: '"id"'
@@ -135,7 +135,7 @@
         if(this.$login.r.includes('删除模板')){
           row.path = row.f_downloadpath
           row.blobid = row.f_blobid
-          this.$resetpost('api/af-revenue/logic/deletefiles', row).then((res) => {
+          this.$resetpost('rs/logic/deletefiles', row).then((res) => {
             setTimeout(() => {
             this.selfSearch()
             }, 1000)

package/src/components/FilesManage/TotalSplit/SplitList.vue

@@ -87,7 +87,7 @@ import * as Util from '../../Util'
 export default {
   data () {
     return {
-      model: new PagedList('api/af-revenue/sql/singleTable_OrderBy', 50, {orderitem: '"' + this.orderitem + '"',
+      model: new PagedList('rs/sql/singleTable_OrderBy', 50, {orderitem: '"' + this.orderitem + '"',
         items: '"' + this.items + '"',
         tablename: '"' + this.tablename + '"'}),
       definedShow: false,

package/src/components/FilesManage/TotalSplit/TotalSplitList.vue

@@ -71,7 +71,7 @@ export default {
       )
     },
     deleteSplit (row) {
-      this.$resetpost('api/af-revenue/logic/deleteSplit', {data: row}).then((res) => {
+      this.$resetpost('rs/logic/deleteSplit', {data: row}).then((res) => {
         this.getUpdate(this.data.f_user_id)
       })
     }

package/src/components/FilesManage/UserAddressCollection.vue

@@ -307,7 +307,7 @@ export default {
     async initpcds (pconditon) {
       this.pcdslist = []
       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_pcd',
@@ -330,7 +330,7 @@ export default {
     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',
@@ -356,7 +356,7 @@ export default {
       // }
       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',
@@ -536,7 +536,7 @@ export default {
         }
         this.$showMessage('确定要批量添加' + this.addresslist.length + '户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('api/af-revenue/logic/address_adduserlist', {data: {addlist: this.addresslist}}, msg).then((req) => {
+            this.$resetpost('rs/logic/address_adduserlist', {data: {addlist: this.addresslist}}, msg).then((req) => {
               this.cleardara()
               this.$dispatch('confirm')
             })
@@ -595,7 +595,7 @@ export default {
           this.newmodel.f_address = this.newmodel.f_residential_area + (this.newmodel.f_building ? this.newmodel.f_building + this.newmodel.f_building_suffix : '') + (this.newmodel.f_unit ? this.newmodel.f_unit + this.newmodel.f_unit_suffix : '') + (this.newmodel.f_floor ? this.newmodel.f_floor + this.newmodel.f_floor_suffix : '') + this.newmodel.f_room + this.newmodel.f_room_suffix
         }
       }
-      await this.$resetpost('api/af-revenue/logic/address_updateuseraddress', this.newmodel)
+      await this.$resetpost('rs/logic/address_updateuseraddress', this.newmodel)
     },
     cancel () {
       this.cleardara()