address-client 3.2.104 → 3.2.105-ls

package/src/filiale/yangchun/sale.js

@@ -1,7 +1,7 @@
-// 分公司特殊组件页面注册
-
-let specialComp = {
-  // 小区添加
-  'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) }
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+
+let specialComp = {
+  // 小区添加
+  'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) }
+}
+exports.specialComp = specialComp

package/src/filiale/zhongsheng/AddressList.vue

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

package/src/filiale/zhongsheng/AreaList.vue

@@ -46,7 +46,7 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
-                            sqlurl="api/af-revenue/logic/exportfile"
+                            sqlurl="rs/logic/exportfile"
                             sql-name="manage_getarealist"
                             template-name='小区信息查询导出'
                             :choose-col="true"></export-excel>
@@ -221,7 +221,7 @@
           f_slice_area: '',
           f_residential_area: ''
         },
-        model: new PagedList('api/af-revenue/sql/address_getarealist',20),
+        model: new PagedList('rs/sql/address_getarealist',20),
         addflag: false,
         addtitle:'',
         getfield: {},
@@ -292,7 +292,7 @@
           condition:this.areacondition
         }
         let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {data: temp},
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {data: temp},
           {resolveMsg: null, rejectMsg: '获取小区失败!'})
         console.log('小区',data)
         this.residentialArea = []
@@ -334,7 +334,7 @@
       async delete(row){
         if(row.id >= 0){
           var id = row.id
-          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
             {data: {
                 items: 'f_residential_area_id',
                 tablename: 't_user_address',
@@ -344,7 +344,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')
             })
           }
@@ -387,7 +387,7 @@
           if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
             this.showDelete = true
             let condition = `a.f_orgid = '${this.f_filialeids}'`
-            let req = await this.$resetpost('api/af-revenue/sql/address_getresidential', {
+            let req = await this.$resetpost('rs/sql/address_getresidential', {
               data: {
                 condition: condition
               }
@@ -419,7 +419,7 @@
         this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
           oldAreaIds[n] = row.id
         })
-        this.$resetpost('api/af-revenue/logic/batchDelete',{
+        this.$resetpost('rs/logic/batchDelete',{
           data:{
                 areamodel:this.areamodel,
                 oldAreaIds:oldAreaIds,

package/src/filiale/zhongyi/AddAreaMsg.vue

@@ -415,7 +415,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',
@@ -439,7 +439,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',
@@ -463,7 +463,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',
@@ -488,7 +488,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.areamodel.f_area_id = ''
         }else{
-          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_area',
@@ -513,7 +513,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)
@@ -590,7 +590,7 @@
         this.buildingmodel.f_orgname = this.$login.f.orgs
         this.buildingmodel.f_depid = this.$login.f.depids
         this.buildingmodel.f_depname = this.$login.f.deps
-        await this.$resetpost('api/af-revenue/logic/address_savebuilding', this.buildingmodel)
+        await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
         this.$refs.buildinglist.search()
       },
       //保存小区
@@ -614,7 +614,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/filiale/zhoukou/AddAreaMsg.vue

@@ -372,7 +372,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',
@@ -396,7 +396,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',
@@ -421,7 +421,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.areamodel.f_area_id = ''
         }else{
-          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
+          let res =await this.$resetpost('rs/sql/address_singleTableOrderBy', {
             data: {
               items: '*',
               tablename: 't_area',
@@ -446,7 +446,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)
@@ -530,7 +530,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_updateareazk', this.areamodel)
+        await this.$resetpost('rs/logic/address_updateareazk', this.areamodel)
       },
       cleardara(){
         this.areamodel= {

package/src/filiale/zhoukou/AddressList.vue

@@ -46,7 +46,7 @@
                       @click="$parent.$parent.importAddress('完善')">完善地址</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
-                            sqlurl="api/af-revenue/logic/exportfile"
+                            sqlurl="rs/logic/exportfile"
                             sql-name="addressGetAddress"
                             template-name='地址管理查询导出'
                             :choose-col="true"></export-excel>
@@ -213,7 +213,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'f_create_date desc'`}),
+        model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'f_create_date desc'`}),
         config: {
           // 导出列要和查询列相同
           excelHeaders: {
@@ -313,11 +313,11 @@
       async delete(row){
         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 = '正常'`}},{resolveMsg: null, rejectMsg: null})
+          let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
           if(userfiles.data.length){
             this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
           }else{
-            this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
               this.$dispatch('cancel')
             })
           }
@@ -357,7 +357,7 @@
           type :this.imptype
         }
         console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
           this.isbusy = false
           if(res.data.type=="success"){
             this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);

package/src/filiale/zhoukou/AreaList.vue

@@ -45,7 +45,7 @@
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
-                            sqlurl="api/af-revenue/logic/exportfile"
+                            sqlurl="rs/logic/exportfile"
                             sql-name="address_getarealist"
                             template-name='小区信息查询导出'
                             :choose-col="true"></export-excel>
@@ -179,7 +179,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getarealist',20),
+        model: new PagedList('rs/sql/address_getarealist',20),
         addflag: false,
         addtitle:'',
         getfield: {},
@@ -235,7 +235,7 @@
       async delete(row){
         if(row.id >= 0){
           var id = row.id
-          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
             {data: {
                 items: 'f_residential_area_id',
                 tablename: 't_user_address',
@@ -245,7 +245,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')
             })
           }

package/src/filiale/zhoukou/UserAddress.vue

@@ -495,7 +495,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',
@@ -518,7 +518,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',
@@ -544,7 +544,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',
@@ -722,7 +722,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')
             })
@@ -775,7 +775,7 @@ export default {
         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()
@@ -879,7 +879,7 @@ export default {
         condition = `f_iscity = '${this.model.f_iscity}' and  a.f_orgid = '${this.f_filialeids}'`
       }
        let HttpReset = new HttpResetClass()
-       let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_getresidential', {
+       let req = await HttpReset.load('POST', 'rs/sql/address_getresidential', {
         data: {
           condition: condition
         }

package/src/main.js

@@ -3,17 +3,16 @@ import App from './App'
 import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
-import { sale } from 'sale-client'
 import address from './address'
 
 Vue.config.silent = true
 
 /** **************************通用组件******************************/
 all()
-address()
+address('WEINAN')
 system(false)
 ldap()
-sale()
+// sale()
 require('system-clients/src/styles/less/bootstrap.less')
 
 

package/build/versionCheck.js

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