manage-client 4.1.109 → 4.1.111

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.
Files changed (13) hide show
  1. package/build/dev-server.js +145 -145
  2. package/package.json +1 -1
  3. package/src/components/SellReport/SellBySelfHelp.vue +11 -0
  4. package/src/components/sale/config/exportConfig.js +2 -2
  5. package/src/filiale/WEINAN/ChangeMeterQuery.vue +13 -13
  6. package/src/filiale/WEINAN/RecordInfoQuery.vue +2 -0
  7. package/src/filiale/WEINAN/config/exportConfig.js +5 -8
  8. package/src/filiale/jinbin/exportConfig.js +1110 -0
  9. package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +1372 -0
  10. package/src/filiale/jinbin/sale.js +7 -0
  11. package/src/filiale/jingyang/ChargeQuery.vue +13 -13
  12. package/src/filiale/meihekou/UserGasAll.vue +658 -0
  13. package/src/filiale/meihekou/webmeterManage.js +7 -0
package/build/dev-server.js CHANGED
@@ -1,145 +1,145 @@
1
- const express = require('express')
2
- const webpack = require('webpack')
3
- const config = require('./webpack.dev.conf')
4
- const proxyMiddleware = require('http-proxy-middleware')
5
-
6
- const app = express()
7
- const compiler = webpack(config)
8
-
9
- const server = 'http://36.134.191.191:31467/'
10
- const local = 'http://127.0.0.1:9026/'
11
- const proxyTable = {
12
- '/rs/logic/exportfile': {
13
- target: server
14
- },
15
- '/dataManage': {
16
- target: server
17
- },
18
- // '/api/af-revenue/sql/': {
19
- // pathRewrite: {
20
- // '^/api/af-revenue': '/'
21
- // },
22
- // target: local
23
- // },
24
- // '/api/af-revenue/report/': {
25
- // pathRewrite: {
26
- // '^/api/af-revenue': '/'
27
- // },
28
- // target: local
29
- // },
30
- // '/api/af-revenue/logic': {
31
- // pathRewrite: {
32
- // '^/api/af-revenue': '/'
33
- // },
34
- // target: local
35
- // },
36
- '/api': {
37
- target: server
38
- },
39
- '/rs/sql/chargeQuery_by_gasproperties': {
40
- target: server
41
- },
42
- '/rs/logic/chargeQuery_by_gasproperties_line': {
43
- target: server
44
- },
45
- '/files': {
46
- target: server
47
- },
48
- // 查找资源服务数据
49
- '/rs/search': {
50
- target: server
51
- },
52
- // 查找资源服务数据
53
- '/rs/logic/getLogin': {
54
- target: server
55
- },
56
- // 查找资源服务数据
57
- '/rs/logic/getInitData': {
58
- target: server
59
- },
60
- '/rs/logic/getSaleInitData': {
61
- target: server
62
- },
63
- // 用户登录服务地址
64
- '/rs/user': {
65
- target: server
66
- },
67
- '/rs/path/getParams': {
68
- target: server
69
- },
70
- '/rs/data': {
71
- target: server
72
- },
73
- '/rs/license': {
74
- target: server
75
- },
76
- '/rs/db': {
77
- target: server
78
- },
79
- '/excel': {
80
- target: server
81
- },
82
- '/rs/config': {
83
- target: server
84
- },
85
- '/rs/sql/getLicenseById': {
86
- target: server
87
- },
88
- '/rs/report': {
89
- target: server
90
- },
91
- '/rs/vue': {
92
- target: server
93
- },
94
- '/rs/file': {
95
- target: server
96
- },
97
- '/rs/sql/singleTable': {
98
- target: server
99
- },
100
- '/rs': {
101
- target: server
102
- }
103
- }
104
-
105
- const devMiddleware = require('webpack-dev-middleware')(compiler, {
106
- publicPath: config.output.publicPath,
107
- stats: {
108
- colors: true,
109
- chunks: false
110
- }
111
- })
112
-
113
- const hotMiddleware = require('webpack-hot-middleware')(compiler)
114
- // force page reload when html-webpack-plugin template changes
115
- compiler.plugin('compilation', function (compilation) {
116
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
117
- hotMiddleware.publish({action: 'reload'})
118
- cb()
119
- })
120
- })
121
-
122
- // proxy api requests
123
- Object.keys(proxyTable).forEach(function (context) {
124
- let options = proxyTable[context]
125
- if (typeof options === 'string') {
126
- options = {target: options}
127
- }
128
- app.use(proxyMiddleware(context, options))
129
- })
130
-
131
- app.use(require('connect-history-api-fallback')())
132
-
133
- app.use(devMiddleware)
134
-
135
- app.use(hotMiddleware)
136
-
137
- app.use('/static', express.static('./static'))
138
-
139
- module.exports = app.listen(8015, function (err) {
140
- if (err) {
141
- console.log(err)
142
- return
143
- }
144
- console.log('Listening at http://localhost:8015')
145
- })
1
+ const express = require('express')
2
+ const webpack = require('webpack')
3
+ const config = require('./webpack.dev.conf')
4
+ const proxyMiddleware = require('http-proxy-middleware')
5
+
6
+ const app = express()
7
+ const compiler = webpack(config)
8
+
9
+ const server = 'http://192.168.50.67:31567/'
10
+ const local = 'http://127.0.0.1:9026/'
11
+ const proxyTable = {
12
+ '/rs/logic/exportfile': {
13
+ target: server
14
+ },
15
+ '/dataManage': {
16
+ target: server
17
+ },
18
+ '/api/af-revenue/sql/': {
19
+ pathRewrite: {
20
+ '^/api/af-revenue': '/'
21
+ },
22
+ target: local
23
+ },
24
+ '/api/af-revenue/report/': {
25
+ pathRewrite: {
26
+ '^/api/af-revenue': '/'
27
+ },
28
+ target: local
29
+ },
30
+ '/api/af-revenue/logic': {
31
+ pathRewrite: {
32
+ '^/api/af-revenue': '/'
33
+ },
34
+ target: local
35
+ },
36
+ '/api': {
37
+ target: server
38
+ },
39
+ '/rs/sql/chargeQuery_by_gasproperties': {
40
+ target: server
41
+ },
42
+ '/rs/logic/chargeQuery_by_gasproperties_line': {
43
+ target: server
44
+ },
45
+ '/files': {
46
+ target: server
47
+ },
48
+ // 查找资源服务数据
49
+ '/rs/search': {
50
+ target: server
51
+ },
52
+ // 查找资源服务数据
53
+ '/rs/logic/getLogin': {
54
+ target: server
55
+ },
56
+ // 查找资源服务数据
57
+ '/rs/logic/getInitData': {
58
+ target: server
59
+ },
60
+ '/rs/logic/getSaleInitData': {
61
+ target: server
62
+ },
63
+ // 用户登录服务地址
64
+ '/rs/user': {
65
+ target: server
66
+ },
67
+ '/rs/path/getParams': {
68
+ target: server
69
+ },
70
+ '/rs/data': {
71
+ target: server
72
+ },
73
+ '/rs/license': {
74
+ target: server
75
+ },
76
+ '/rs/db': {
77
+ target: server
78
+ },
79
+ '/excel': {
80
+ target: server
81
+ },
82
+ '/rs/config': {
83
+ target: server
84
+ },
85
+ '/rs/sql/getLicenseById': {
86
+ target: server
87
+ },
88
+ '/rs/report': {
89
+ target: server
90
+ },
91
+ '/rs/vue': {
92
+ target: server
93
+ },
94
+ '/rs/file': {
95
+ target: server
96
+ },
97
+ '/rs/sql/singleTable': {
98
+ target: server
99
+ },
100
+ '/rs': {
101
+ target: server
102
+ }
103
+ }
104
+
105
+ const devMiddleware = require('webpack-dev-middleware')(compiler, {
106
+ publicPath: config.output.publicPath,
107
+ stats: {
108
+ colors: true,
109
+ chunks: false
110
+ }
111
+ })
112
+
113
+ const hotMiddleware = require('webpack-hot-middleware')(compiler)
114
+ // force page reload when html-webpack-plugin template changes
115
+ compiler.plugin('compilation', function (compilation) {
116
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
117
+ hotMiddleware.publish({action: 'reload'})
118
+ cb()
119
+ })
120
+ })
121
+
122
+ // proxy api requests
123
+ Object.keys(proxyTable).forEach(function (context) {
124
+ let options = proxyTable[context]
125
+ if (typeof options === 'string') {
126
+ options = {target: options}
127
+ }
128
+ app.use(proxyMiddleware(context, options))
129
+ })
130
+
131
+ app.use(require('connect-history-api-fallback')())
132
+
133
+ app.use(devMiddleware)
134
+
135
+ app.use(hotMiddleware)
136
+
137
+ app.use('/static', express.static('./static'))
138
+
139
+ module.exports = app.listen(8015, function (err) {
140
+ if (err) {
141
+ console.log(err)
142
+ return
143
+ }
144
+ console.log('Listening at http://localhost:8015')
145
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.1.109",
3
+ "version": "4.1.111",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/SellBySelfHelp.vue CHANGED
@@ -26,6 +26,14 @@
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
28
  </div>
29
+ <div class="col-sm-4">
30
+ <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
31
+ <v-select :value.sync="model.f_payment" multiple
32
+ v-model="model.f_payment"
33
+ :options='$parent.$parent.payment' placeholder='请选择'
34
+ condition="f_payment in {}"
35
+ close-on-select></v-select>
36
+ </div>
29
37
  <div class="col-sm-4">
30
38
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
31
39
  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
@@ -250,6 +258,9 @@
250
258
  }
251
259
  },
252
260
  computed: {
261
+ payment() {
262
+ return [...this.$appdata.getParam('付款方式查询')]
263
+ },
253
264
  usertypes() {
254
265
  return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
255
266
  }
package/src/components/sale/config/exportConfig.js CHANGED
@@ -762,10 +762,10 @@ export default {
762
762
  'f_address': '客户地址',
763
763
  'f_type': '换表类型',
764
764
  'f_changemeter_fee': '换表费',
765
- 'f_meternumber_old': '旧表号',
766
765
  'f_meternumber': '新表号',
767
- 'f_meter_brand_old': '旧气表品牌',
768
766
  'f_meter_brand': '新气表品牌',
767
+ 'f_meternumber_old': '旧表号',
768
+ 'f_meter_brand_old': '旧气表品牌',
769
769
  'f_remanent_gas': '补气量',
770
770
  'f_remanent_money': '补气金额',
771
771
  'f_comments': '备注',
package/src/filiale/WEINAN/ChangeMeterQuery.vue CHANGED
@@ -112,14 +112,14 @@
112
112
  close-on-select></v-select>
113
113
  </div>
114
114
  <div class="col-sm-2 form-group">
115
- <label class="font_normal_body">新表卡号</label>
116
- <input type="text" style="width:60%" class="input_search" v-model="model.f_newcard_id"
117
- condition="f_newcard_id = '{}'" placeholder='新表卡号'>
115
+ <label class="font_normal_body">新表表号</label>
116
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
117
+ condition="f_meternumber = '{}'" placeholder='新表表号'>
118
118
  </div>
119
119
  <div class="col-sm-2 form-group">
120
- <label class="font_normal_body">旧表卡号</label>
121
- <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
122
- condition="f_card_id = '{}'" placeholder='旧表卡号'>
120
+ <label class="font_normal_body">旧表表号</label>
121
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber_old"
122
+ condition="f_meternumber_old = '{}'" placeholder='旧表表号'>
123
123
  </div>
124
124
  <div class="col-sm-2 form-group">
125
125
  <label class="font_normal_body">换表状态</label>
@@ -224,16 +224,16 @@
224
224
  <nobr>换表费</nobr>
225
225
  </th>
226
226
  <th>
227
- <nobr>旧表号</nobr>
227
+ <nobr>新表号</nobr>
228
228
  </th>
229
229
  <th>
230
- <nobr>新表号</nobr>
230
+ <nobr>新气表品牌</nobr>
231
231
  </th>
232
232
  <th>
233
233
  <nobr>旧气表品牌</nobr>
234
234
  </th>
235
235
  <th>
236
- <nobr>新气表品牌</nobr>
236
+ <nobr>旧表号</nobr>
237
237
  </th>
238
238
  <th>
239
239
  <nobr>补气量</nobr>
@@ -292,16 +292,16 @@
292
292
  <nobr>{{row.f_changemeter_fee}}</nobr>
293
293
  </td>
294
294
  <td style="text-align: center;">
295
- <nobr>{{row.f_meternumber_old}}</nobr>
295
+ <nobr>{{row.f_meternumber}}</nobr>
296
296
  </td>
297
297
  <td style="text-align: center;">
298
- <nobr>{{row.f_meternumber}}</nobr>
298
+ <nobr>{{row.f_meter_brand}}</nobr>
299
299
  </td>
300
300
  <td style="text-align: center;">
301
- <nobr>{{row.f_meter_brand_old}}</nobr>
301
+ <nobr>{{row.f_meternumber_old}}</nobr>
302
302
  </td>
303
303
  <td style="text-align: center;">
304
- <nobr>{{row.f_meter_brand}}</nobr>
304
+ <nobr>{{row.f_meter_brand_old}}</nobr>
305
305
  </td>
306
306
  <td style="text-align: center;">
307
307
  <nobr>{{row.f_remanent_gas.toFixed(0)}}</nobr>
package/src/filiale/WEINAN/RecordInfoQuery.vue CHANGED
@@ -448,6 +448,7 @@
448
448
  <th><nobr>开户状态</nobr></th>
449
449
  <th><nobr>卡号</nobr></th>
450
450
  <th><nobr>客户名称</nobr></th>
451
+ <th><nobr>片区</nobr></th>
451
452
  <th><nobr>小区名称</nobr></th>
452
453
  <!-- <th><nobr>表具类型</nobr></th>-->
453
454
  <!-- <th><nobr>表流量</nobr></th>-->
@@ -567,6 +568,7 @@
567
568
  <td style="text-align: center;"><nobr>{{row.type}}</nobr></td>
568
569
  <td style="text-align: center;"><nobr>{{row.f_card_id}}</nobr></td>
569
570
  <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
571
+ <td style="text-align: center;"><nobr>{{row.f_zones}}</nobr></td>
570
572
  <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
571
573
 
572
574
  <!-- <td style="text-align: center;"><nobr>{{row.f_meter_size}}</nobr></td>-->
package/src/filiale/WEINAN/config/exportConfig.js CHANGED
@@ -133,7 +133,7 @@ export default{
133
133
  'f_type': '收费类型', 'f_state': '收费状态', 'f_operate_date': '操作时间', 'f_orgname': '所属公司'
134
134
  },
135
135
  compreConfig: {
136
- 'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
136
+ 'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'type': '开户状态', 'f_card_id': '卡号', 'f_user_name': '客户名称', 'f_zones': '片区',
137
137
  'f_residential_area': '小区名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_user_usetype': '用气类型',
138
138
  'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '气表类型', 'f_meter_brand': '气表品牌',
139
139
  'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '左右表', 'f_install_date': '安装日期', 'f_meter_base': '气表底数',
@@ -144,13 +144,10 @@ export default{
144
144
  'f_used_name': '曾用名', 'f_rent_phone': '备用电话', 'f_rent_name': '租户姓名', 'f_zuhu_phone': '租户电话',
145
145
  'f_contract_id': '发票编码', 'f_is_mgq': '是否煤改气', 'f_send_usegas_card': '是否发放天然气使用证',
146
146
  'f_usetype': '使用类型', 'f_meter_style': '气表型号', 'f_table_state': '表状态', 'f_initial_base': '初始气表底数',
147
- 'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额', 'f_inputtor': '表册抄表员',
148
- 'f_book_inputtor': '档案抄表员',
149
- 'f_userfiles_address': '安装地址', 'f_install_person': '安装人', 'f_gas_person': '通气人',
150
- 'f_meter_book_num': '抄表册编号', 'f_meter_book_sort': '抄表册顺序',
151
- 'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
152
- 'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
153
- , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
147
+ 'f_total_usegas_amount': '累计用气金额', 'f_total_gas': '表累购气量', 'f_total_fee': '表累购金额',
148
+ 'f_userfiles_address': '安装地址', 'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
149
+ 'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型',
150
+ 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
154
151
  'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_meter_size': '表具大小', 'f_meter_flow': '表流量'
155
152
  },
156
153