manage-client 4.1.13 → 4.1.14

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://192.168.50.67:30785/'
-var qtx = 'http://192.168.50.67: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://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31567/'
+var bendi = 'http://192.168.50.67:30785/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:31567/'
+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,6 +33,15 @@ var proxyTable = {
     target: 'http://203.57.101.233:9001/'
 
   },
+  // '/api/af-auth/login': {
+  //   target: 'http://127.0.0.1:31467/'
+  // },
+  // '/api/af-system': {
+  //   pathRewrite: {
+  //     '^/api/af-system': '/'
+  //   },
+  //   target: 'http://127.0.0.1:9002/'
+  // },
   '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
@@ -78,7 +87,10 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://192.168.50.67:31567/'
+    pathRewrite: {
+      '^/rs/search': '/search'
+    },
+    target: 'http://127.0.0.1:9002/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {

package/package.json

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

package/src/components/sale/businessquery/WebHandplanQuery.vue

@@ -927,12 +927,12 @@
       },
       getfield() {
         return {
-          'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_valve_state': '阀门状态',
+          'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机',
           'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
           'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
           'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
           'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
-          'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月','f_current_deduct_amount':'本次抵扣金额','f_remaining_deduct_amount':'剩余抵扣金额'
+          'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月'
         }
       },
       getBankfield(){

package/src/filiale/shaoguan/RecordInfoQuery.vue

@@ -398,6 +398,7 @@
                   <th><nobr>气表安装日期</nobr></th>
                   <th><nobr>通气人</nobr></th>
                   <th><nobr>通气日期</nobr></th>
+                  <th><nobr>检测日期</nobr></th>
                   <th><nobr>最后抄表日期</nobr></th>
                   <!--<th><nobr>最后购气日期</nobr></th>-->
                   <th><nobr>阀门状态</nobr></th>
@@ -510,6 +511,7 @@
                <td :class="row.f_user_state === '销户'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>{{row.f_install_date}}</nobr></td>
                <td :class="row.f_user_state === '销户'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>{{row.f_gas_person}}</nobr></td>
                <td :class="row.f_user_state === '销户'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>
+               <td :class="row.f_user_state === '销户'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>{{row.f_scrap_date}}</nobr></td>
 
                <td :class="row.f_user_state === '销户'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
                <!--<td :class="row.f_user_state === '销户'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->

package/src/filiale/shaoguan/config/exportConfig.js

@@ -134,7 +134,7 @@ export default{
     'f_userfiles_address': '安装地址','f_install_person': '安装人','f_install_date': '安装日期','f_gas_person': '通气人','f_gas_date': '通气日期',
     'f_fire_state': '点火状态','f_valve_state': '阀门状态','f_meter_book_num': '抄表册编号','f_meter_book_sort': '抄表册顺序','f_card_id': '卡号',
     'f_aroundmeter': '左右表','f_whether_hairpin': '是否发卡','f_balance_amount': '表剩余金额','f_times': '写卡次数',
-    'f_fillcard_times': '补卡次数','f_hand_date': '最后抄表日期','f_sendsuccess': '表同步状态','f_bank_accopen':'银行户名','f_bank_name':'银行名称','f_bank_account':'银行账号','f_bank_idnumber':'银行身份证号'
+    'f_fillcard_times': '补卡次数','f_hand_date': '最后抄表日期', 'f_sendsuccess': '表同步状态', 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号', 'f_bank_idnumber': '银行身份证号', 'f_scrap_date': '检测日期'
   },
   changemeterConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址',

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/fugou/sale'
+// import ShanXianSaleManage from './filiale/fugou/sale'
  // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
@@ -49,7 +49,7 @@ saleManage()
 webmeterManage()
 ManageHome()
 newmanage()
-ShanXianSaleManage()
+// ShanXianSaleManage()
 reportManage()
 // ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')