sale-client-xianyang 3.3.449 → 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.
package/build/dev-server.js
CHANGED
|
@@ -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://
|
|
10
|
-
var local = 'http://
|
|
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/
|
|
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:
|
|
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:
|
|
83
|
+
target: server
|
|
84
84
|
},
|
|
85
85
|
'/rs/entity': {
|
|
86
|
-
target:
|
|
86
|
+
target: server
|
|
87
87
|
},
|
|
88
88
|
'/rs/sql': {
|
|
89
|
-
target:
|
|
89
|
+
target: server
|
|
90
90
|
},
|
|
91
91
|
'/webmeter': {
|
|
92
92
|
target: server
|
package/package.json
CHANGED
|
@@ -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: []
|
|
@@ -1387,7 +1387,7 @@ let reissueCardGen = function * (model, row) {
|
|
|
1387
1387
|
f_card_id: model.f_card_id,
|
|
1388
1388
|
f_ispick_table: model.f_ispick_table,
|
|
1389
1389
|
f_cardfees: model.f_cardfees,
|
|
1390
|
-
f_payment: model.f_payment[0],
|
|
1390
|
+
f_payment: model.f_cardfees === 0 || model.f_cardfees === '0' ? '现金缴费' : model.f_payment[0],
|
|
1391
1391
|
f_bill_style: model.f_print[0],
|
|
1392
1392
|
f_comments: model.f_comments,
|
|
1393
1393
|
record_userinfo: row.f_userinfo_id,
|