sale-client 3.6.191 → 3.6.192

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue +5 -5
  3. package/src/filiale/lixianV3/MeterReadAudit.vue +6 -6
  4. package/src/plugins/CommonService.js +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.191",
3
+ "version": "3.6.192",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue CHANGED
@@ -59,9 +59,9 @@
59
59
  v-el:cc></v-select>
60
60
  </div>
61
61
  <div class="form-group col-sm-2">
62
- <label class="font_normal_body">表编号&nbsp;&nbsp;&nbsp;</label>
63
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id" placeholder='表编号'
64
- condition="f_user_id = '{}'">
62
+ <label class="font_normal_body">表号&nbsp;&nbsp;&nbsp;</label>
63
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber" placeholder='表编号'
64
+ condition="f_meternumber = '{}'">
65
65
  </div>
66
66
  <div class="form-group col-sm-2">
67
67
  <label class="font_normal_body">用户姓名</label>
@@ -118,7 +118,7 @@
118
118
  <tr>
119
119
  <th>序号</th>
120
120
  <th>用户编号</th>
121
- <th>表编号</th>
121
+ <th>表号</th>
122
122
  <th>用户姓名</th>
123
123
  <th>用户地址</th>
124
124
  <th>上期底数</th>
@@ -140,7 +140,7 @@
140
140
  <template partial='body'>
141
141
  <td style="text-align:center">{{ $index + 1 }}</td>
142
142
  <td style="text-align:center">{{ row.f_userinfo_code }}</td>
143
- <td style="text-align:center">{{ row.f_user_id }}</td>
143
+ <td style="text-align:center">{{ row.f_meternumber }}</td>
144
144
  <td style="text-align:center">{{ row.f_user_name }}</td>
145
145
  <td style="text-align:center">{{ row.f_address }}</td>
146
146
  <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
package/src/filiale/lixianV3/MeterReadAudit.vue CHANGED
@@ -80,9 +80,9 @@
80
80
  v-el:cc></v-select>
81
81
  </div>
82
82
  <div class="form-group col-sm-2">
83
- <label class="font_normal_body">表编号&nbsp;&nbsp;&nbsp;</label>
84
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_id" placeholder='表编号'
85
- condition="f_user_id = '{}'">
83
+ <label class="font_normal_body">表号&nbsp;&nbsp;&nbsp;</label>
84
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber" placeholder='表号'
85
+ condition="f_meternumber = '{}'">
86
86
  </div>
87
87
  <div class="form-group col-sm-2">
88
88
  <label class="font_normal_body">用户姓名</label>
@@ -139,7 +139,7 @@
139
139
  <tr>
140
140
  <th>序号</th>
141
141
  <th>用户编号</th>
142
- <th>表编号</th>
142
+ <th>表号</th>
143
143
  <th>用户姓名</th>
144
144
  <th>用户地址</th>
145
145
  <th>上期底数</th>
@@ -161,7 +161,7 @@
161
161
  <template partial='body'>
162
162
  <td style="text-align:center">{{ $index + 1 }}</td>
163
163
  <td style="text-align:center">{{ row.f_userinfo_code }}</td>
164
- <td style="text-align:center">{{ row.f_user_id }}</td>
164
+ <td style="text-align:center">{{ row.f_meternumber }}</td>
165
165
  <td style="text-align:center">{{ row.f_user_name }}</td>
166
166
  <td style="text-align:center">{{ row.f_address }}</td>
167
167
  <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
@@ -249,7 +249,7 @@ export default {
249
249
  // 导出列要和查询列相同
250
250
  excelHeaders: {
251
251
  'f_userinfo_code':'用户编号',
252
- 'f_user_id': '表编号',
252
+ 'f_meternumber': '表号',
253
253
  'f_user_name': '用户姓名',
254
254
  'f_address': '用户地址',
255
255
  'f_last_tablebase': '上期表底数',
package/src/plugins/CommonService.js CHANGED
@@ -266,9 +266,9 @@ let CommonService = {
266
266
  if (cardParams.data.heatamount.includes(';')) {
267
267
  let heatamounts = cardParams.data.heatamount.split(';')
268
268
  if (heatamounts.length >= 2) {
269
- result.cnstairgas1 = heatamounts[0] !== '' ? parseInt(heatamounts[0] + result.stairgas1) : result.stairgas1
270
- result.cnstairgas2 = heatamounts[1] !== '' ? parseInt(heatamounts[1] + result.stairgas2) : result.stairgas2
271
- result.cnstairgas3 = heatamounts[2] !== '' ? parseInt(heatamounts[2] + result.stairgas3) : result.stairgas3
269
+ result.cnstairgas1 = heatamounts[0] !== '' ? parseInt(heatamounts[0]) + parseInt(result.stairgas1) : result.stairgas1
270
+ result.cnstairgas2 = heatamounts[1] !== '' ? parseInt(heatamounts[1]) + parseInt(result.stairgas2) : result.stairgas2
271
+ result.cnstairgas3 = heatamounts[2] !== '' ? parseInt(heatamounts[2]) + parseInt(result.stairgas3) : result.stairgas3
272
272
  }
273
273
  }
274
274
  }