manage-client 4.1.24 → 4.1.25

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://192.168.50.67:31567/'
 // 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://127.0.0.1:9026/'
 // 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.24",
+    "version": "4.1.25",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/filiale/rongcheng/RecordInfoQuery.vue

@@ -838,7 +838,7 @@ export default {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
     },
     ischangecheck() {
-      return [{label: '否', value: '否'},{label: '是', value: '是'}]
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('是否换表安检')]
     },
     zbf() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('自闭阀')]

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

@@ -291,6 +291,8 @@
                 </th>
                 <th><nobr>旧表类型</nobr></th>
                 <th><nobr>新表类型</nobr></th>
+                <th><nobr>旧表底数</nobr></th>
+                <th><nobr>新表底数</nobr></th>
                 <th>
                   <nobr>上期抄表底数</nobr>
                 </th>
@@ -398,6 +400,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_base_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_base}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_last_tablebase}}</nobr>
               </td>

package/src/filiale/rongcheng/exportConfig.js

@@ -211,12 +211,16 @@ export default {
     'f_type': '换表类型',
     'f_meter_change_type': '换表方式',
     'f_changemeter_fee': '换表费',
-    'f_meter_base': '旧表底数',
-    'f_newmeter_base': '新表底数',
+    'f_meter_base_old': '旧表底数',
+    'f_meter_base': '新表底数',
     'f_card_id': '旧表卡号',
     'f_newcard_id': '新表卡号',
     'f_meter_classify': '旧气表类型',
     'f_newmeter_classify': '新气表类型',
+    'f_last_tablebase': '上期抄表底数',
+    'f_tablebase': '本期抄表底数',
+    'f_used_content': '换表前气价名称',
+    'f_new_content': '换表后气价名称',
     'f_state': '状态',
     'f_changemeter_date': '换表日期',
     'f_comments': '备注',