manage-client 3.3.148 → 3.3.150

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/sale/businessquery/chargeRecordMaintenanceQuery.vue +4 -4
  3. package/src/filiale/lixianV3/ChangeMeterQuery.vue +60 -61
  4. package/src/filiale/lixianV3/config/exportConfig.js +5 -0
  5. package/src/filiale/shaoguan/RecordInfoQuery.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.148",
3
+ "version": "3.3.150",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/chargeRecordMaintenanceQuery.vue CHANGED
@@ -9,8 +9,8 @@
9
9
  <div class="col-sm-2 form-group">
10
10
  <label for="startDate" class="font_normal_body">开始日期</label>
11
11
  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
12
- v-model="$parent.$parent.startDate"
13
- :value.sync="$parent.$parent.startDate"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
14
  :format="'yyyy-MM-dd'"
15
15
  condition="modifitime >= '{} 00:00:00'"
16
16
  :show-reset-button="true">
@@ -19,8 +19,8 @@
19
19
  <div class="col-sm-2 form-group">
20
20
  <label for="endDate" class="font_normal_body">结束日期</label>
21
21
  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
22
- v-model="$parent.$parent.endDate"
23
- :value.sync="$parent.$parent.endDate"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
24
  :format="'yyyy-MM-dd'"
25
25
  condition="modifitime <= '{} 23:59: 59'"
26
26
  :show-reset-button="true">
package/src/filiale/lixianV3/ChangeMeterQuery.vue CHANGED
@@ -219,25 +219,19 @@
219
219
  <nobr>客户名称</nobr>
220
220
  </th>
221
221
  <th>
222
- <nobr>档案编号</nobr>
223
- </th>
224
- <th>
225
- <nobr>付款方式</nobr>
226
- </th>
227
- <th>
228
- <nobr>旧表底数</nobr>
222
+ <nobr>换表原因</nobr>
229
223
  </th>
230
224
  <th>
231
- <nobr>新表底数</nobr>
225
+ <nobr>旧气表品牌</nobr>
232
226
  </th>
233
227
  <th>
234
- <nobr>表上余额</nobr>
228
+ <nobr>旧表号</nobr>
235
229
  </th>
236
230
  <th>
237
- <nobr>累购气量</nobr>
231
+ <nobr>旧表底数</nobr>
238
232
  </th>
239
233
  <th>
240
- <nobr>累购金额</nobr>
234
+ <nobr>补气量</nobr>
241
235
  </th>
242
236
  <th>
243
237
  <!--<nobr>客户地址</nobr>-->
@@ -245,55 +239,65 @@
245
239
  :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
246
240
  </th>
247
241
  <th>
248
- <nobr>换表类型</nobr>
242
+ <!-- <nobr>换表日期</nobr>-->
243
+ <data-order field="f_operate_date" name="换表日期"
244
+ :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
249
245
  </th>
250
246
  <th>
251
- <nobr>换表费</nobr>
247
+ <nobr>付款方式</nobr>
252
248
  </th>
253
249
  <th>
254
250
  <nobr>表方向</nobr>
255
251
  </th>
256
252
  <th>
257
- <nobr>旧表号</nobr>
253
+ <nobr>新气表品牌</nobr>
258
254
  </th>
259
255
  <th>
260
256
  <nobr>新表号</nobr>
261
257
  </th>
262
258
  <th>
263
- <nobr>表封号</nobr>
259
+ <nobr>新表底数</nobr>
264
260
  </th>
265
261
  <th>
266
- <nobr>旧气表品牌</nobr>
262
+ <nobr>换表人</nobr>
267
263
  </th>
268
264
  <th>
269
- <nobr>新气表品牌</nobr>
265
+ <nobr>备注</nobr>
270
266
  </th>
271
267
  <th>
272
- <nobr>补气量</nobr>
268
+ <nobr>换表类型</nobr>
269
+ </th>
270
+ <th>
271
+ <nobr>状态</nobr>
273
272
  </th>
274
273
  <th>
275
274
  <nobr>补气金额</nobr>
276
275
  </th>
277
276
  <th>
278
- <nobr>订单编号</nobr>
277
+ <nobr>换表费</nobr>
279
278
  </th>
280
279
  <th>
281
- <nobr>备注</nobr>
280
+ <nobr>档案编号</nobr>
282
281
  </th>
283
282
  <th>
284
- <nobr>换表原因</nobr>
283
+ <nobr>表上余额</nobr>
285
284
  </th>
286
285
  <th>
287
- <nobr>换表人</nobr>
286
+ <nobr>累购气量</nobr>
288
287
  </th>
289
288
  <th>
290
- <nobr>状态</nobr>
289
+ <nobr>累购金额</nobr>
291
290
  </th>
292
291
  <th>
293
- <!-- <nobr>换表日期</nobr>-->
294
- <data-order field="f_operate_date" name="换表日期"
295
- :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
292
+ <nobr>表封号</nobr>
296
293
  </th>
294
+ <th>
295
+ <nobr>订单编号</nobr>
296
+ </th>
297
+ <th><nobr>旧表类型</nobr></th>
298
+ <th><nobr>新表类型</nobr></th>
299
+ <th><nobr>旧抄表员</nobr></th>
300
+ <th><nobr>用户类型</nobr></th>
297
301
  <th>
298
302
  <nobr>人员</nobr>
299
303
  </th>
@@ -303,10 +307,6 @@
303
307
  <th>
304
308
  <nobr>公司</nobr>
305
309
  </th>
306
- <th><nobr>旧表类型</nobr></th>
307
- <th><nobr>新表类型</nobr></th>
308
- <th><nobr>旧抄表员</nobr></th>
309
- <th><nobr>用户类型</nobr></th>
310
310
  <th><nobr>附件</nobr></th>
311
311
  </tr>
312
312
  </template>
@@ -318,86 +318,76 @@
318
318
  <nobr>{{row.f_user_name}}</nobr>
319
319
  </td>
320
320
  <td style="text-align: center;">
321
- <nobr>{{row.f_olduserinfo_code}}</nobr>
322
- </td>
323
- <td style="text-align: center;">
324
- <nobr>{{row.f_payment}}</nobr>
325
- </td>
326
- <td style="text-align: center;">
327
- <nobr>{{row.f_using_base_old}}</nobr>
321
+ <nobr>{{row.f_changetables_reason}}</nobr>
328
322
  </td>
329
323
  <td style="text-align: center;">
330
- <nobr>{{row.f_meter_base}}</nobr>
324
+ <nobr>{{row.f_meter_brand_old}}</nobr>
331
325
  </td>
332
326
  <td style="text-align: center;">
333
- <nobr>{{row.f_balance_amount}}</nobr>
327
+ <nobr>{{row.f_meternumber_old}}</nobr>
334
328
  </td>
335
329
  <td style="text-align: center;">
336
- <nobr>{{row.leigougas}}</nobr>
330
+ <nobr>{{row.f_using_base_old}}</nobr>
337
331
  </td>
338
332
  <td style="text-align: center;">
339
- <nobr>{{row.leigoumoney}}</nobr>
333
+ <nobr>{{row.f_remanent_gas}}</nobr>
340
334
  </td>
341
335
  <td style="text-align: center;">
342
336
  <nobr>{{row.f_address}}</nobr>
343
337
  </td>
344
-
345
338
  <td style="text-align: center;">
346
- <nobr>{{row.f_type}}</nobr>
339
+ <nobr>{{row.f_operate_date}}</nobr>
347
340
  </td>
348
341
  <td style="text-align: center;">
349
- <nobr>{{row.f_changemeter_fee}}</nobr>
342
+ <nobr>{{row.f_payment}}</nobr>
350
343
  </td>
351
344
  <td style="text-align: center;">
352
345
  <nobr>{{row.f_aroundmeter}}</nobr>
353
346
  </td>
354
347
  <td style="text-align: center;">
355
- <nobr>{{row.f_meternumber_old}}</nobr>
348
+ <nobr>{{row.f_meter_brand}}</nobr>
356
349
  </td>
357
350
  <td style="text-align: center;">
358
351
  <nobr>{{row.f_meternumber}}</nobr>
359
352
  </td>
360
353
  <td style="text-align: center;">
361
- <nobr>{{row.f_metertitles}}</nobr>
362
- </td>
363
- <td style="text-align: center;">
364
- <nobr>{{row.f_meter_brand_old}}</nobr>
354
+ <nobr>{{row.f_meter_base}}</nobr>
365
355
  </td>
366
356
  <td style="text-align: center;">
367
- <nobr>{{row.f_meter_brand}}</nobr>
357
+ <nobr>{{row.f_change_operator}}</nobr>
368
358
  </td>
369
359
  <td style="text-align: center;">
370
- <nobr>{{row.f_remanent_gas}}</nobr>
360
+ <nobr>{{row.f_comments}}</nobr>
371
361
  </td>
372
362
  <td style="text-align: center;">
373
- <nobr>{{row.f_remanent_money}}</nobr>
363
+ <nobr>{{row.f_type}}</nobr>
374
364
  </td>
375
365
  <td style="text-align: center;">
376
- <nobr>{{row.f_serial_number}}</nobr>
366
+ <nobr>{{row.f_state}}</nobr>
377
367
  </td>
378
368
  <td style="text-align: center;">
379
- <nobr>{{row.f_comments}}</nobr>
369
+ <nobr>{{row.f_remanent_money}}</nobr>
380
370
  </td>
381
371
  <td style="text-align: center;">
382
- <nobr>{{row.f_changetables_reason}}</nobr>
372
+ <nobr>{{row.f_changemeter_fee}}</nobr>
383
373
  </td>
384
374
  <td style="text-align: center;">
385
- <nobr>{{row.f_change_operator}}</nobr>
375
+ <nobr>{{row.f_olduserinfo_code}}</nobr>
386
376
  </td>
387
377
  <td style="text-align: center;">
388
- <nobr>{{row.f_state}}</nobr>
378
+ <nobr>{{row.f_balance_amount}}</nobr>
389
379
  </td>
390
380
  <td style="text-align: center;">
391
- <nobr>{{row.f_operate_date}}</nobr>
381
+ <nobr>{{row.leigougas}}</nobr>
392
382
  </td>
393
383
  <td style="text-align: center;">
394
- <nobr>{{row.f_operator}}</nobr>
384
+ <nobr>{{row.leigoumoney}}</nobr>
395
385
  </td>
396
386
  <td style="text-align: center;">
397
- <nobr>{{row.f_depname}}</nobr>
387
+ <nobr>{{row.f_metertitles}}</nobr>
398
388
  </td>
399
389
  <td style="text-align: center;">
400
- <nobr>{{row.f_orgname}}</nobr>
390
+ <nobr>{{row.f_serial_number}}</nobr>
401
391
  </td>
402
392
  <td style="text-align: center;">
403
393
  <nobr>{{row.f_meter_type_old}}</nobr>
@@ -411,6 +401,15 @@
411
401
  <td style="text-align: center;">
412
402
  <nobr>{{row.f_user_type}}</nobr>
413
403
  </td>
404
+ <td style="text-align: center;">
405
+ <nobr>{{row.f_operator}}</nobr>
406
+ </td>
407
+ <td style="text-align: center;">
408
+ <nobr>{{row.f_depname}}</nobr>
409
+ </td>
410
+ <td style="text-align: center;">
411
+ <nobr>{{row.f_orgname}}</nobr>
412
+ </td>
414
413
  <td style="text-align: center;"><nobr>
415
414
  <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
416
415
  </nobr></td>
package/src/filiale/lixianV3/config/exportConfig.js CHANGED
@@ -674,7 +674,12 @@ export default {
674
674
  'f_balance_amount': '表上余额',
675
675
  'leigougas': '累购气量',
676
676
  'leigoumoney': '累购金额',
677
+ 'f_metertitles': '表封号',
678
+ 'f_serial_number': '订单编号',
679
+ 'f_meter_type_old': '旧表类型',
680
+ 'f_meter_type': '新表类型',
677
681
  'f_inputtor_old': '旧抄表员',
682
+ 'f_user_type': '用户类型',
678
683
  'f_operator': '人员',
679
684
  'f_depname': '部门',
680
685
  'f_orgname': '公司'
package/src/filiale/shaoguan/RecordInfoQuery.vue CHANGED
@@ -618,7 +618,7 @@
618
618
  </modal>
619
619
  </div>
620
620
  <div class="flex" v-if="show">
621
- <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
621
+ <user-info-detail-manage-new :show="false" :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
622
622
  </div>
623
623
  </div>
624
624
  </div>