manage-client 4.1.30 → 4.1.31-weinan

package/build/dev-server.js

@@ -11,17 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://61.163.123.47:30785/'
-var qtx = 'http://61.163.123.47:30785/'
+var shaoguan = 'http://119.146.1.106:8300/'
+var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
-// var bendi = 'http://172.168.1.11:9001/'
+var bendi = 'http://172.168.1.11:8400/'
 // 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://61.163.123.47:30785/'
+// var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://61.163.123.47:30785/'
+var wode = 'http://172.168.1.11:8400/'
 // 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'
@@ -30,55 +30,31 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://203.57.101.233:9001/'
+    target: bendi
 
   },
-  '/api/af-revenue/sql/WeChatPaydetail': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/WeChatPayment': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    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': {
+  '/api/af-revenue/sql/': {
     pathRewrite: {
-      '^/api/af-revenue': '/rs'
+      '^/api/af-revenue': '/'
     },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/inspectList': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
+    target: wode
   },
   '/api': {
-    target: 'http://61.163.123.47:30785/'
+    target: bendi
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
-    target: 'http://localhost:8084/'
+    target: bendi
   },
   '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: 'http://localhost:8084/'
+    target: bendi
   },
   '/files': {
     target: bendi
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://61.163.123.47:30785/'
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -120,7 +96,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://61.163.123.47:30785/'
+    target: bendi
   },
   '/rs/file': {
     target: bendi
@@ -129,7 +105,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs': {
-    target: wode
+    target: bendi
   }
 }
 

package/package.json

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

package/src/filiale/WEINAN/RecordInfoQuery.vue

@@ -920,9 +920,9 @@
         this.prices = this.$MagGetSaleParam.getPrices();
       },
       async getaddress (searchText){
-        let condition = ' 1 = 1 '
+        let condition = ` f_orgid = '${this.$login.f.orgid}'`
         if (searchText) {
-          condition = ` f_residential_area like '%${searchText}%' `
+          condition = condition + ` and f_residential_area like '%${searchText}%' `
         }
         let HttpReset = new HttpResetClass()
         HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -433,13 +433,13 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
 
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     // self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
-    self.initParams()
+    await self.initParams()
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
     // self.getaddress()
     // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }

package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue

@@ -401,7 +401,7 @@
                 <nobr>{{row.f_meter_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_base_old}}</nobr>
+                <nobr>{{row.f_using_base_old}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_base}}</nobr>

package/src/filiale/ruihua/sale.js

@@ -1,13 +1,13 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-
-export default function () {
-  // 物联网抄表查询
-  Vue.component('web-handplan-query', (resolve) => {
-    require(['./WebHandplanQuery'], resolve)
-  })
-  // 综合档案信息查询
-  Vue.component('record-info-query', (resolve) => {
-    require(['./RecordInfoQuery'], resolve)
-  })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 物联网抄表查询
+  Vue.component('web-handplan-query', (resolve) => {
+    require(['./WebHandplanQuery'], resolve)
+  })
+  // 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => {
+    require(['./RecordInfoQuery'], resolve)
+  })
+}