manage-client 3.3.243 → 3.3.244

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": "3.3.243",
3
+ "version": "3.3.244",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -314,6 +314,15 @@
314
314
  <th>
315
315
  <nobr>公司</nobr>
316
316
  </th>
317
+ <th>
318
+ <nobr>抵扣单价</nobr>
319
+ </th>
320
+ <th>
321
+ <nobr>本次抵扣金额</nobr>
322
+ </th>
323
+ <th>
324
+ <nobr>剩余抵扣金额</nobr>
325
+ </th>
317
326
  </tr>
318
327
  </template>
319
328
  <template partial='body'>
@@ -437,6 +446,15 @@
437
446
  <td style="text-align: center;">
438
447
  <nobr>{{row.f_orgname}}</nobr>
439
448
  </td>
449
+ <td style="text-align: center;">
450
+ <nobr>{{ row.f_gas_type }}</nobr>
451
+ </td>
452
+ <td style="text-align: center;">
453
+ <nobr>{{ row.f_current_deduct_amount }}</nobr>
454
+ </td>
455
+ <td style="text-align: center;">
456
+ <nobr>{{ row.f_remaining_deduct_amount }}</nobr>
457
+ </td>
440
458
  </template>
441
459
  <template partial='foot'></template>
442
460
  </data-grid>
@@ -913,7 +931,7 @@
913
931
  'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
914
932
  'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
915
933
  'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
916
- 'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月'
934
+ 'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月','f_current_deduct_amount':'本次抵扣金额','f_remaining_deduct_amount':'剩余抵扣金额'
917
935
  }
918
936
  },
919
937
  getBankfield(){
@@ -367,7 +367,7 @@
367
367
  user:[]
368
368
  },
369
369
  condition: '1=1',
370
- org:[this.$login.f.orgid],
370
+ org:`u.${[this.$login.f.orgid]}`,
371
371
  orgCondtionStr: ` and u.f_orgid = ${this.$login.f.orgid}`
372
372
  }
373
373
  },