manage-client 4.0.27 → 4.0.28

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.27",
3
+ "version": "4.0.28",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -673,7 +673,10 @@ export default {
673
673
  'f_devices_type': '灶具信息',
674
674
  'f_network_valve': '自动阀控',
675
675
  'f_defendcard': '防盗卡号',
676
- 'f_factory_date': '生产年月'
676
+ 'f_factory_date': '生产年月',
677
+ 'latest_f_pregas' : '最后购气量',
678
+ 'latest_f_collection':'最后购气金额',
679
+ 'f_max_operate_date': '最后购气日期'
677
680
  },
678
681
 
679
682
  compreConfigGY: {
@@ -612,7 +612,9 @@
612
612
  <!--<nobr>最后抄表日期</nobr>-->
613
613
  <data-order field="f_hand_date" name="最后抄表日期" :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></data-order>
614
614
  </th>
615
- <!--<th><nobr>最后购气日期</nobr></th>-->
615
+ <th><nobr>最后购气量</nobr></th>
616
+ <th><nobr>最后购气金额</nobr></th>
617
+ <th><nobr>最后购气日期</nobr></th>
616
618
 
617
619
  <th><nobr>自动阀控</nobr></th>
618
620
  <th><nobr>阀门状态</nobr></th>
@@ -767,7 +769,9 @@
767
769
  <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
768
770
  <td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
769
771
  <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
770
- <!-- <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
772
+ <td style="text-align: center;"><nobr>{{row.latest_f_pregas}}</nobr></td>
773
+ <td style="text-align: center;"><nobr>{{row.latest_f_collection}}</nobr></td>
774
+ <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>
771
775
  <td style="text-align: center;"><nobr>{{row.f_network_valve}}</nobr></td>
772
776
  <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
773
777
 
@@ -334,7 +334,7 @@
334
334
  气量合计:&emsp;{{sumsmodel.f_real_amount}}
335
335
  </td>
336
336
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
337
- 总购气量合计:&emsp;{{sumsmodel.f_card_total_gas}}
337
+ 气费合计:&emsp;{{sumsmodel.f_real_fee}}
338
338
  </td>
339
339
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
340
340
  余量合计:&emsp;{{sumsmodel.f_yuliang}}
@@ -398,7 +398,7 @@
398
398
  other:[],
399
399
  footer:[],
400
400
  data: {},
401
- model: new PagedList('api/af-revenue/sql/cardhandplanQuery', 20, {},{f_real_amount:0,f_card_total_gas:0,f_yuliang:0,f_stairamount1:0,
401
+ model: new PagedList('api/af-revenue/sql/cardhandplanQuery', 20, {},{f_real_amount:0,f_real_fee:0,f_card_total_gas:0,f_yuliang:0,f_stairamount1:0,
402
402
  f_stair1fee:0,
403
403
  f_stair2amount:0,
404
404
  f_stair2fee:0,