manage-client 4.1.144 → 4.1.145

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,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
6
6
  const app = express()
7
7
  const compiler = webpack(config)
8
8
 
9
- const server = 'http://192.168.50.67:31567/'
10
- const local = 'http://127.0.0.1:9026/'
9
+ const server = 'http://121.36.106.17:31467/'
10
+ const local = 'http://121.36.106.17:31467/'
11
11
  const proxyTable = {
12
12
  '/rs/logic/exportfile': {
13
13
  target: server
@@ -16,21 +16,21 @@ const proxyTable = {
16
16
  target: server
17
17
  },
18
18
  '/api/af-revenue/sql/': {
19
- pathRewrite: {
20
- '^/api/af-revenue': '/'
21
- },
19
+ // pathRewrite: {
20
+ // '^/api/af-revenue': '/'
21
+ // },
22
22
  target: local
23
23
  },
24
24
  '/api/af-revenue/report/': {
25
- pathRewrite: {
26
- '^/api/af-revenue': '/'
27
- },
25
+ // pathRewrite: {
26
+ // '^/api/af-revenue': '/'
27
+ // },
28
28
  target: local
29
29
  },
30
30
  '/api/af-revenue/logic': {
31
- pathRewrite: {
32
- '^/api/af-revenue': '/'
33
- },
31
+ // pathRewrite: {
32
+ // '^/api/af-revenue': '/'
33
+ // },
34
34
  target: local
35
35
  },
36
36
  '/api': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.144",
3
+ "version": "4.1.145",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -184,8 +184,7 @@ export default {
184
184
  computed: {
185
185
  group1() {
186
186
  return [{label:'用气性质', value:'f_gasproperties'},
187
- {label:'用气类型', value:'f_user_gas_type'},
188
- {label:'气价名称', value:'f_price_name'}
187
+ {label:'用气类型', value:'f_user_gas_type'}
189
188
 
190
189
  ]
191
190
  }
@@ -203,6 +203,12 @@
203
203
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
204
204
  合计金额:&emsp;{{(sumsmodel.f_preamount-sumsmodel.cardfee).toFixed(2)}}
205
205
  </td>
206
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
207
+ 退费笔数:&emsp;{{sumsmodel.f_tuifei_count.toFixed(2)}}&emsp;
208
+ </td>
209
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
210
+ 退费金额:&emsp;{{sumsmodel.f_tuifei_money.toFixed(2)}}
211
+ </td>
206
212
  </tr>
207
213
  </table>
208
214
  </div>
@@ -247,7 +253,9 @@
247
253
  f_pregas:0,
248
254
  f_preamount:0,
249
255
  xianjin:0,
250
- zhuanzhang:0
256
+ zhuanzhang:0,
257
+ f_tuifei_count: 0,
258
+ f_tuifei_money: 0
251
259
  }),
252
260
  gasproperties:[],
253
261
  show:false,
@@ -269,14 +277,16 @@
269
277
  sumsmodel: {},
270
278
  sumField: {
271
279
  'cardfee': '卡费', 'f_pregas': '方量', 'f_preamount': '金额', 'xiaoji': '小计','xianjin': '现金',
272
- 'zhuanzhang': '转账'
280
+ 'zhuanzhang': '转账', 'f_tuifei_count': '退费笔数', 'f_tuifei_money': '退费金额'
273
281
  },
274
282
  pageSum: {
275
283
  'cardfee': '0.00',
276
284
  'f_pregas': '0.00',
277
285
  'f_preamount': '0.00',
278
286
  'xianjin': '0.00',
279
- 'zhuanzhang': '0.00'
287
+ 'zhuanzhang': '0.00',
288
+ 'f_tuifei_count': '0.00',
289
+ 'f_tuifei_money': '0.00'
280
290
  },
281
291
  defaultfield: [],
282
292
  config: {