manage-client 3.2.154 → 3.2.155

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/sale/businessquery/GroupChargeQuery.vue +22 -10
  3. package/src/components/sale/config/exportConfig.js +2 -2
  4. package/src/filiale/macheng/MonthGasQuery.vue +8 -0
  5. package/src/filiale/macheng/config/exportConfig.js +1 -1
  6. package/src/filiale/qianneng/MeterQuery.vue +11 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.154",
3
+ "version": "3.2.155",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/GroupChargeQuery.vue CHANGED
@@ -116,17 +116,23 @@
116
116
  <th>
117
117
  <nobr>气费</nobr>
118
118
  </th>
119
+ <!-- <th>-->
120
+ <!-- <nobr>应交违约金</nobr>-->
121
+ <!-- </th>-->
122
+ <!-- <th>-->
123
+ <!-- <nobr>实交违约金</nobr>-->
124
+ <!-- </th>-->
119
125
  <th>
120
- <nobr>应交违约金</nobr>
126
+ <nobr>上期余额</nobr>
121
127
  </th>
122
128
  <th>
123
- <nobr>实交违约金</nobr>
129
+ <nobr>本期余额</nobr>
124
130
  </th>
125
131
  <th>
126
- <nobr>上期余额</nobr>
132
+ <nobr>账户支出</nobr>
127
133
  </th>
128
134
  <th>
129
- <nobr>本期余额</nobr>
135
+ <nobr>账户存入</nobr>
130
136
  </th>
131
137
  <th>
132
138
  <nobr>收款</nobr>
@@ -177,17 +183,23 @@
177
183
  <td style="text-align: center;">
178
184
  <nobr>{{row.f_preamount}}</nobr>
179
185
  </td>
186
+ <!-- <td style="text-align: center;">-->
187
+ <!-- <nobr>{{row.f_delay}}</nobr>-->
188
+ <!-- </td>-->
189
+ <!-- <td style="text-align: center;">-->
190
+ <!-- <nobr>{{row.f_delaypay}}</nobr>-->
191
+ <!-- </td>-->
180
192
  <td style="text-align: center;">
181
- <nobr>{{row.f_delay}}</nobr>
193
+ <nobr>{{row.f_balance}}</nobr>
182
194
  </td>
183
195
  <td style="text-align: center;">
184
- <nobr>{{row.f_delaypay}}</nobr>
196
+ <nobr>{{row.f_curbalance}}</nobr>
185
197
  </td>
186
198
  <td style="text-align: center;">
187
- <nobr>{{row.f_balance}}</nobr>
199
+ <nobr>{{row.f_newbalance}}</nobr>
188
200
  </td>
189
201
  <td style="text-align: center;">
190
- <nobr>{{row.f_curbalance}}</nobr>
202
+ <nobr>{{row.f_newcurbalance}}</nobr>
191
203
  </td>
192
204
  <td style="text-align: center;">
193
205
  <nobr>{{row.f_collection}}</nobr>
@@ -277,14 +289,14 @@
277
289
  data: {},
278
290
  getstart:'',
279
291
  show:false,
280
- chargetype: [{label: '批量收费', value: '批量收费'}, {label: '团体收费', value: '团体收费'}],
292
+ chargetype: [{label: '团体收费', value: '团体收费'}, {label: '团体退费', value: '团体退费'}],
281
293
  rowdata:{},
282
294
  initres: {
283
295
  org:[this.$login.f.orgid],
284
296
  dep:[],
285
297
  user:[]
286
298
  },
287
- model: new PagedList('rs/sql/manage_singleTable', 20, {items: `'*'`, orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`, tablename: `'t_sellinggasbatch'`},{
299
+ model: new PagedList('rs/sql/groupChargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
288
300
  f_pregas: 0,
289
301
  f_preamount: 0,
290
302
  f_collection: 0,
package/src/components/sale/config/exportConfig.js CHANGED
@@ -46,7 +46,7 @@ export default{
46
46
  'f_address': '客户地址'
47
47
  },
48
48
  meterConfig: {
49
- 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号',
49
+ 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_customer': '团缴编号',
50
50
  'f_user_phone': '客户电话','f_rent_phone': '备用电话', 'idnumber': '身份证号', 'f_address': '客户地址', 'f_book_slice_area': '表册片区',
51
51
  'f_balance_amount': '表上余额', 'f_user_type': '客户类型', 'f_usetype': '使用类型', 'f_gasproperties': '用气性质',
52
52
  'f_meternumber': '表号', 'f_card_id': '卡号', 'f_price_name': '气价名称', 'value': '气价详情', 'f_meter_brand': '气表品牌',
@@ -987,7 +987,7 @@ export default{
987
987
  },
988
988
  GroupCharge: {
989
989
  'id': '收费编号', 'f_user_name': '客户姓名', 'f_user_type': '客户类型', 'f_address': '客户地址','f_pregas': '气量','f_preamount': '气费','f_delay': '应交违约金','f_delaypay': '实交违约金',
990
- 'f_balance': '上期余额','f_curbalance': '本期余额','f_collection': '收款','f_state': '收费状态','f_operate_date': '收费日期','f_payment': '付款方式','f_type': '收费类型','f_comments': '备注',
990
+ 'f_balance': '上期余额','f_curbalance': '本期余额','f_newbalance': '账户支出', 'f_newcurbalance': '账户存入', 'f_collection': '收款','f_state': '收费状态','f_operate_date': '收费日期','f_payment': '付款方式','f_type': '收费类型','f_comments': '备注',
991
991
  'f_operator': '收费人','f_orgname': '部门','f_depname': '公司'
992
992
  },
993
993
  // 上报数据
package/src/filiale/macheng/MonthGasQuery.vue CHANGED
@@ -107,6 +107,8 @@
107
107
  <tr>
108
108
  <th><nobr>客户编号</nobr></th>
109
109
  <th><nobr>客户名称</nobr></th>
110
+ <th><nobr>客户类型</nobr></th>
111
+ <th><nobr>用气性质</nobr></th>
110
112
  <th><nobr>一月</nobr></th>
111
113
  <th><nobr>二月</nobr></th>
112
114
  <th><nobr>三月</nobr></th>
@@ -133,6 +135,12 @@
133
135
  <td style="text-align: center;">
134
136
  <nobr>{{row.username}}</nobr>
135
137
  </td>
138
+ <td style="text-align: center;">
139
+ <nobr>{{row.f_user_type}}</nobr>
140
+ </td>
141
+ <td style="text-align: center;">
142
+ <nobr>{{row.f_gasproperties}}</nobr>
143
+ </td>
136
144
  <td style="text-align: center;">
137
145
  <nobr>{{row.jan}}</nobr>
138
146
  </td>
package/src/filiale/macheng/config/exportConfig.js CHANGED
@@ -64,7 +64,7 @@ export default{
64
64
  'f_tablebase': '本期底数', 'f_balance': '账户余额', 'f_oughtfee_all': '合计欠费', 'f_oughtfee_all_new': '实际欠费'
65
65
  },
66
66
  monthGasConfig: {
67
- 'code': '客户编号', 'username': '客户名称', 'jan': '一月',
67
+ 'code': '客户编号', 'username': '客户名称','f_user_type':'客户类型','f_gasproperties':'用气性质', 'jan': '一月',
68
68
  'feb': '二月', 'mar': '三月', 'apr': '四月',
69
69
  'may': '五月', 'jun': '六月', 'jul': '七月', 'jug': '八月',
70
70
  'sep': '九月', 'oct': '十月', 'nov': '十一月', 'dec': '十二月',
package/src/filiale/qianneng/MeterQuery.vue CHANGED
@@ -73,6 +73,11 @@
73
73
  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
74
74
  condition="f_userinfo_code = '{}' " placeholder="客户编号">
75
75
  </div>
76
+ <div class="col-sm-2 form-group">
77
+ <label class="font_normal_body" style="color: red">团缴编号</label>
78
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_customer"
79
+ condition="f_customer = '{}' " placeholder="团缴编号">
80
+ </div>
76
81
  <div class="col-sm-2 form-group">
77
82
  <label class="font_normal_body" style="color: red">入户证号</label>
78
83
  <input type="text" style="width:60%" class="input_search" v-model="model.f_enter_number"
@@ -304,6 +309,9 @@
304
309
  <th>
305
310
  <nobr>档案编号</nobr>
306
311
  </th>
312
+ <th>
313
+ <nobr>团缴编号</nobr>
314
+ </th>
307
315
  <th>
308
316
  <nobr>客户电话</nobr>
309
317
  </th>
@@ -407,6 +415,9 @@
407
415
  <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
408
416
  <nobr>{{row.f_olduserinfo_code}}</nobr>
409
417
  </td>
418
+ <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
419
+ <nobr>{{row.f_customer}}</nobr>
420
+ </td>
410
421
  <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
411
422
  <nobr>{{row.f_user_phone}}</nobr>
412
423
  </td>