manage-client 4.0.12 → 4.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
19
19
  // var bendi = 'http://192.168.50.4:8400/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://192.168.50.4:8400/'
22
+ var bendi = 'http://192.168.50.67:31567/'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://192.168.50.4:8400/'
24
+ var wode = 'http://192.168.50.67:31567/'
25
25
  // 192.168.
26
26
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
27
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -30,7 +30,7 @@ var proxyTable = {
30
30
  target: bendi
31
31
  },
32
32
  '/api': {
33
- target: 'http://192.168.50.4:8400'
33
+ target: wode
34
34
 
35
35
  },
36
36
  '/rs/sql/chargeQuery_by_gasproperties': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.12",
3
+ "version": "4.0.14",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -512,7 +512,7 @@
512
512
  <th colspan="6">
513
513
  <nobr>燃气表</nobr>
514
514
  </th>
515
- <th colspan="63">
515
+ <th colspan="65">
516
516
  <nobr>其他</nobr>
517
517
  </th>
518
518
  </tr>
@@ -302,11 +302,14 @@ export default {
302
302
  }, chargeexportConfig: {
303
303
  'f_userinfo_code': '客户编号',
304
304
  'f_user_name': '客户名称',
305
+ 'f_address': '客户地址',
305
306
  'f_pregas': '气量',
306
307
  'f_collection': '收款',
307
- 'f_stairamount1': '一阶气量',
308
- 'f_stair2amount': '二阶气量',
309
- 'f_stair3amount': '三阶气量'
308
+ 'f_payment': '付款方式',
309
+ 'f_operate_date': '收费日期',
310
+ 'f_operator': '操作员',
311
+ 'f_depname': '部门',
312
+ 'f_stair1price': '一阶单价'
310
313
  }, loginQueryexportConfig: {
311
314
  'f_userinfo_id': '登录人编号',
312
315
  'f_user_name': '登录人名称',
@@ -112,8 +112,8 @@
112
112
  <div class="col-sm-2 form-group">
113
113
  <label for="startDate" class="font_normal_body">建档日期</label>
114
114
  <datepicker placeholder="建档日期小于等于" style="width:60%"
115
- v-model="model.f_createfile_date"
116
- :value.sync="model.f_createfile_date"
115
+ v-model="model.f_createfile_date_end"
116
+ :value.sync="model.f_createfile_date_end"
117
117
  :format="'yyyy-MM-dd'"
118
118
  :show-reset-button="true"
119
119
  condition="f_createfile_date <= '{} 23:59:59'">
@@ -501,7 +501,7 @@
501
501
  <th rowspan="2">
502
502
  <nobr>序号</nobr>
503
503
  </th>
504
- <th colspan="6">
504
+ <th colspan="7">
505
505
  <nobr>用户信息</nobr>
506
506
  </th>
507
507
  <th colspan="5">
package/src/main.js CHANGED
@@ -6,7 +6,6 @@ import { all } from 'vue-client'
6
6
  import { system } from 'system-clients'
7
7
  import { ldap } from 'ldap-clients'
8
8
  import saleManage from './saleManage'
9
- import ShanXianSaleManage from './filiale/yangchun/sale'
10
9
  import ShanXianwebSaleManage from './filiale/shexian/webmeterManage'
11
10
  import webmeterManage from './webmeterManage'
12
11
  import reportManage from './reportManage'
@@ -52,7 +51,6 @@ ManageHome()
52
51
  newmanage()
53
52
  ShanXianwebSaleManage()
54
53
  reportManage()
55
- ShanXianSaleManage()
56
54
  require('system-clients/src/styles/less/bootstrap.less')
57
55
  require('./components/qinhua/Style/qinhuaStyle.less')
58
56
  // require('./bootstrap/less/manageStyle/manageChile.less')