sale-client 3.6.140 → 3.6.141

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/revenue/comprehen/gasbrand/GasBrandList.vue +1 -1
  3. package/src/filiale/qianneng/revenue/machineHandManage/machineHandAudit.vue +5 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.140",
3
+ "version": "3.6.141",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/comprehen/gasbrand/GasBrandList.vue CHANGED
@@ -87,7 +87,7 @@
87
87
  <td style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></td>
88
88
  <td style="text-align:center"><nobr>{{row.gasmodel_id}}</nobr></td>
89
89
  <td style="text-align:center"><nobr>{{row.f_meter_style}}</nobr></td>
90
- <td style="text-align:center"><nobr>{{row.f_type}}</nobr></td>
90
+ <td style="text-align:center"><nobr>{{row.f_meter_type}}</nobr></td>
91
91
  </tr>
92
92
  </template>
93
93
  <template partial='foot'></template>
package/src/filiale/qianneng/revenue/machineHandManage/machineHandAudit.vue CHANGED
@@ -614,11 +614,11 @@
614
614
  })
615
615
  },
616
616
  selfSearch (args) {
617
- // if (!this.orgCondtionStr) {
618
- // args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
619
- // } else {
620
- // args.condition = `${args.condition}` + this.orgCondtionStr
621
- // }
617
+ if (!this.orgCondtionStr) {
618
+ args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
619
+ } else {
620
+ args.condition = `${args.condition}` + this.orgCondtionStr
621
+ }
622
622
  this.excelCondition = args.condition
623
623
  this.condition = args.condition
624
624
  this.$refs.paged.$refs.grid.selectInit()