sale-client 3.6.293 → 3.6.294-preview

package/build/dev-server.js

@@ -1,108 +1,109 @@
-var path = require('path')
-var checkVersion = require('./versionCheck.js')
-checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/api': {
-        target: v4Url
-      },
-      '/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/file': {
-        target: localUrl
-      },
-      '/webapps': {
-        target: serverRul
-      },
-      '/rs/sql/singleTable': {
-        target: serverRul
-      },
-      '/invoice': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      '/rs/logic/webHandReverse': {
-        target: 'http://localhost:8085'
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      },
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+var checkVersion = require('./versionCheck.js')
+checkVersion()
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:31785', 'http://192.168.50.67:31785', 'http://192.168.50.67:31785']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/api/af-auth': {
+        target: v4Url
+      },
+      '/api/af-system': {
+        target: v4Url
+      },
+      '/api/af-revenue': {
+        pathRewrite: {'/api/af-revenue': '/'},
+        target: 'http://127.0.0.1:9026'
+      },
+      '/invoice/rs/logic/getInvoice': {
+        target: serverRul
+      },
+      '/rs/file': {
+        target: localUrl
+      },
+      '/webapps': {
+        target: serverRul
+      },
+      '/rs/sql/singleTable': {
+        target: serverRul
+      },
+      '/invoice': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic/webHandReverse': {
+        target: 'http://localhost:8085'
+      },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/build/versionCheck.js

@@ -1,29 +1,29 @@
-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 = () => {
-  const {devDependencies} = pkg
-  if (devDependencies && devDependencies['system-clients']) {
-    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
-      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')
-    }
-  }
-}
-
-module.exports = checkVersion
+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 = () => {
+  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')
+    }
+  }
+}
+
+module.exports = checkVersion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.293",
+  "version": "3.6.294-preview",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "qrcodejs2": "^0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.146",
+    "vue-client": "1.24.156",
     "yarn": "^1.22.10"
   },
   "devDependencies": {

package/src/components/FilesManage/AddHostMeterUserList.vue

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

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="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>
@@ -62,7 +62,7 @@
     data () {
       return {
         criteriaShow: false,
-        model: new PagedList('rs/sql/address_getAddress', 20, {}),
+        model: new PagedList('api/af-revenue/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('rs/logic/filemanage_mergeuser', {data: datas}, {resolveMsg: null, rejectMsg: '合并档案失败'})
+        let res = await this.$resetpost('api/af-revenue/logic/filemanage_mergeuser', {data: datas}, {resolveMsg: null, rejectMsg: '合并档案失败'})
         /* let res = {
           data: {
             oldcode : ['001','002'],

package/src/components/FilesManage/FileUserAddress.vue

@@ -365,7 +365,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('rs/sql/address_getresidential', {
+        let req = await this.$resetpost('api/af-revenue/sql/address_getresidential', {
           data: {
             condition: condition
           }
@@ -413,7 +413,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',
@@ -436,7 +436,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',
@@ -462,7 +462,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',
@@ -640,7 +640,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')
               })
@@ -689,7 +689,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/FilesManage/FileUserAddressChange.vue

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