manage-client 4.1.18 → 4.1.19

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://218.77.35.25:30785/'
+var bendi = 'http://192.168.50.67:30785/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://218.77.35.25:30785/'
+var wode = 'http://192.168.50.67:30785/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -33,11 +33,11 @@ var proxyTable = {
     target: 'http://203.57.101.233:9001/'
 
   },
-  '/api/af-revenue/sql/': {
+  '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
-      '^/api/af-revenue': '/'
+      '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:9026/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/WeChatPayment': {
     pathRewrite: {
@@ -45,6 +45,24 @@ var proxyTable = {
     },
     target: 'http://127.0.0.1:8080/'
   },
+  '/api/af-revenue/sql/getGasInspection': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
+  },
+  '/api/af-revenue/sql/inspectList_sellinggas': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
+  },
+  '/api/af-revenue/sql/inspectList': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
+  },
   '/api': {
     target: 'http://192.168.50.67:31567/'
 
@@ -60,7 +78,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://218.77.35.25:30785/'
+    target: 'http://192.168.50.67:30785/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -102,7 +120,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://218.77.35.25:30785/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/rs/file': {
     target: bendi

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.18",
+    "version": "4.1.19",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/sale/filesquery/UserQuery.vue

@@ -799,19 +799,6 @@
         }
       },
       selfSearch(args) {
-        //小区查询条件
-        this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
-        console.log("=====小区model绑定====",this.area)
-        if(this.area.length !== 0){
-          let str = JSON.stringify(this.area)
-          str = str.replace(/"/g,`'`)
-          str = str.replace(/\[/g,``)
-          str = str.replace(/\]/g,``)
-          console.log("=====小区model22222222222绑定====",str)
-          //查询多个小区时条件
-          args.condition += ` and f_residential_area in  ( ${str} )`
-        }
-
         if (!this.orgCondtionStr) {
           args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
         } else {

package/src/filiale/jingyang/MeterQuery.vue

@@ -860,7 +860,7 @@ export default {
       let data = {
         filepath: res.f_downloadpath
       }
-      new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+      new HttpResetClass().load('POST','/rs/logic/meter_GetUserInfoFromExcel', {data: data}, {
         resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
         rejectMsg: '导入失败'
       }).then((res) => {

package/src/filiale/wuhai/UserGasList.vue

@@ -496,7 +496,7 @@
           con= `${this.$refs.paged.$refs.cri.condition} `
         }
         return {
-          condition: con  ,
+          condition: this.condition,
           startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
           endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
         }

package/src/main.js

@@ -6,8 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/haile/sale'
-// import ShanXianwebSaleManage from './filiale/haile/webmeterManage'
+import ShanXianSaleManage from './filiale/rizhao/sale'
+ // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'