sale-client-xianyang 3.3.450 → 3.3.451

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.
@@ -6,13 +6,13 @@ var proxyMiddleware = require('http-proxy-middleware')
6
6
 
7
7
  var app = express()
8
8
  var compiler = webpack(config)
9
- var server = 'http://172.16.16.162:8300'
10
- var local = 'http://172.16.16.162:8300'
9
+ var server = 'http://192.168.153.129:8300'
10
+ var local = 'http://127.0.0.1:8080'
11
11
  var proxyTable = {
12
12
  '/rs/file': {
13
13
  target: server
14
14
  },
15
- '/rs/sql/address_getAddress': {
15
+ '/rs/sql/iot_getNewMeterBrandAndModel': {
16
16
  target: server
17
17
  },
18
18
  '/rs/logic/address_updateuseraddress': {
@@ -22,7 +22,7 @@ var proxyTable = {
22
22
  target: server
23
23
  },
24
24
  '/rs/logic/changeMeter': {
25
- target: local
25
+ target: server
26
26
  },
27
27
  '/pos': {
28
28
  target: server
@@ -80,13 +80,13 @@ var proxyTable = {
80
80
  target: server
81
81
  },
82
82
  '/rs/logic': {
83
- target: local
83
+ target: server
84
84
  },
85
85
  '/rs/entity': {
86
- target: local
86
+ target: server
87
87
  },
88
88
  '/rs/sql': {
89
- target: local
89
+ target: server
90
90
  },
91
91
  '/webmeter': {
92
92
  target: server
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client-xianyang",
3
- "version": "3.3.450",
3
+ "version": "3.3.451",
4
4
  "description": "费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -48,6 +48,8 @@
48
48
  <th><nobr>卡费</nobr></th>
49
49
  <th><nobr>操作人</nobr></th>
50
50
  <th><nobr>补卡日期</nobr></th>
51
+ <th><nobr>收款方式</nobr></th>
52
+ <th><nobr>补卡状态</nobr></th>
51
53
  </tr>
52
54
  </template>
53
55
  <template partial='body' partial='list' v-ref:grid>
@@ -63,6 +65,8 @@
63
65
  <td style="text-align: center;"><nobr>{{row.f_cardfees}}</nobr></td>
64
66
  <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
65
67
  <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
68
+ <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
69
+ <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
66
70
  </tr>
67
71
  </template>
68
72
  <template partial='foot'></template>
@@ -87,9 +91,9 @@
87
91
  all: [],
88
92
  //row数据
89
93
  rowsdata: [],
90
- fields:{'f_card_id': '卡号','f_meter_brand':'气表品牌','f_reason': '补卡原因','f_cardfees':'卡费','f_operate_date':'补卡日期'},
94
+ fields:{'f_card_id': '卡号','f_meter_brand':'气表品牌','f_reason': '补卡原因','f_cardfees':'卡费','f_operate_date':'补卡日期','f_payment':'收款方式','f_state':'补卡状态'},
91
95
  defaultfield: [
92
- "f_card_id","f_meter_brand","f_reason",'f_cardfees',"f_operate_date"
96
+ "f_card_id","f_meter_brand","f_reason",'f_cardfees',"f_operate_date","f_payment","f_state"
93
97
  ],
94
98
  printModel: {
95
99
  rows: []
@@ -124,7 +124,7 @@ export default {
124
124
  }
125
125
  }
126
126
  </script>
127
- <style>
127
+ <style scoped>
128
128
  .datapanel {
129
129
  color: #333;
130
130
  background-color: white;