sale-client 3.5.25 → 3.5.26

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": "sale-client",
3
- "version": "3.5.25",
3
+ "version": "3.5.26",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -363,7 +363,7 @@ let cardBtnGen = async function (self, val) {
363
363
  }
364
364
  if (getUser.data.length == 1 && getUser.data[0].f_alias === self.cardInfo.Factory) {
365
365
  self.readCardParam = getUser.data[0].f_card_password
366
- self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(getUser.data.f_card_password)
366
+ self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(getUser.data[0].f_card_password)
367
367
  } else {
368
368
  self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡!!', 'warning', 2000)
369
369
  return
@@ -114,7 +114,7 @@
114
114
  // console.log('获取登录信息,', self.$login, self.$appdata, self.$appdata.getParam('用户类型'), Vue.$login.f.name)
115
115
  await self.search()
116
116
  await self.$LoadParams.loadParam()
117
- let overdueset= []
117
+ let overdueset = []
118
118
  let res = await self.$resetpost('rs/sql/saleSingleTable', {
119
119
  data: {
120
120
  tablename: 't_overdue_set',
@@ -179,7 +179,7 @@
179
179
 
180
180
  // 是多选
181
181
  if (this.rowsdata.length) {
182
- info = '确认批量修改档案吗?'
182
+ info = `共选中${this.rowsdata.length}条数据,确认批量修改档案吗?`
183
183
  }
184
184
  // 点击的是批量生成
185
185
  this.$showMessage(info, ['confirm', 'cancel']).then(
@@ -70,14 +70,11 @@
70
70
  </div>
71
71
  <div class="col-sm-4 form-group"
72
72
  :class="[$v.f_totalcost.required || $v.f_totalcost.dctest ? 'has-error' : 'has-success']">
73
- <label for="f_temp_amount" v-if="row.f_collection_type === '按气量'"
74
- class=" font_normal_body">应收金额</label>
75
- <label for="f_temp_amount" v-if="row.f_collection_type === '按金额'"
76
- class=" font_normal_body">本次缴费</label>
73
+ <label for="f_temp_amount" class=" font_normal_body">本次缴费</label>
77
74
  <input class="input_search" style="width:60%" type="number"
78
75
  @blur="preamount()" v-model="model.f_totalcost"
79
76
  v-validate:f_totalcost='{required: true, dctest: [(openFee - 0), ">=" ] }' placeholder="应收金额"
80
- v-next-el='sk' v-scale="[model.f_totalcost, 4]" :disabled="row.f_collection_type !== '按金额'">
77
+ v-next-el='sk' v-scale="[model.f_totalcost, 4]">
81
78
  </div>
82
79
  <div class="col-sm-4 form-group" v-if="hasLimit">
83
80
  <label class="font_normal_body">购气上限</label>
@@ -1002,6 +1002,8 @@ let sendCardSaleGasGenremanent = async function (model, row) {
1002
1002
  })
1003
1003
  throw new Error(`卡服务错误:${cardRes.data.Err}${cardRes.data.Exception},请联系开发人员处理!!`)
1004
1004
  } else {
1005
+ // 更新 上次写卡气量
1006
+ await modify(row.f_userfiles_id, params.ql)
1005
1007
  // 写卡成功
1006
1008
  // 更新卡密码
1007
1009
  row.version = result.data.version - 1,
@@ -0,0 +1,380 @@
1
+ <template>
2
+ <div class="flex-row">
3
+ <div class="span">
4
+ <validator name='v'>
5
+ <form novalidate class="form-horizontal">
6
+ <div class="row" v-if="isGas">
7
+ <div class="col-sm-4" :class="[$v.f_pregas.dctest ? 'has-error' : 'has-success']">
8
+ <label class="font_normal_body">应补气量</label>
9
+ <input class="input_search" style="width:60%" type="number" @blur="pregas"
10
+ v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="应补气量" v-ref:f_pregas>
11
+ </div>
12
+ <div class="col-sm-4">
13
+ <label for="f_add_gas" class="font_normal_body">是否入累计</label>
14
+ <v-select id="f_add_gas"
15
+ v-model="model.f_add_gas"
16
+ placeholder='请选择'
17
+ :value.sync="model.f_add_gas"
18
+ :options='addGas'
19
+ close-on-select clear-button>
20
+ </v-select>
21
+ </div>
22
+ <div class="col-sm-4">
23
+ <label for="f_write_card" style="color: red" class=" font_normal_body">是否写卡</label>
24
+ <v-select id="f_write_card"
25
+ v-model="model.f_write_card"
26
+ placeholder='是否写卡'
27
+ value-single
28
+ :value.sync="model.f_write_card"
29
+ :options='writecard'
30
+ close-on-select clear-button></v-select>
31
+ </div>
32
+ </div>
33
+ <div class="row" v-if="!isGas">
34
+ <div class="col-sm-4">
35
+ <label for="f_preamount" class=" font_normal_body">应补金额:</label>
36
+ <input class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" placeholder="金额">
37
+ </div>
38
+ <div class="col-sm-4">
39
+ <label for="f_add_gas" class="font_normal_body">是否入累计:</label>
40
+ <v-select v-model="model.f_add_gas"
41
+ placeholder='请选择'
42
+ :value.sync="model.f_add_gas"
43
+ :options='addGas'
44
+ close-on-select clear-button>
45
+ </v-select>
46
+ </div>
47
+ </div>
48
+ <div class="row" style="margin-top:10px;">
49
+ <label for="f_reason" class=" font_normal_body">备&emsp;&emsp;注</label>
50
+ <input class="input_search" style="width:55%" rows="1" v-model="model.f_reason" placeholder="备注">
51
+ </div>
52
+ </form>
53
+ <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok" v-ref:printbill></print-bill>
54
+ <accept-bill :show="acceptprint" :bill-url='acceptUrl' v-on:toggle="closeAccept" :data='row' :billdata="printData" v-ref:acceptbill @closeaccept="closeAccept"></accept-bill>
55
+ <div style="text-align:right;margin-top: 2%">
56
+ <button class="button_search" @click="accept()" v-if="config.hasAcceptance" :disabled='!$v.valid'>受理单</button>
57
+ <button class="button_search" @click="confirm()" :disabled='!$v.valid' >确认</button>
58
+ <button class="button_clear" @click="clean()" >取消</button>
59
+ </div>
60
+ </validator>
61
+ </div>
62
+ </div>
63
+ <upload :blodid="blodid" isremark="true" fusetype="其他补气"></upload>
64
+ </template>
65
+ <script>
66
+ import Vue from 'vue'
67
+
68
+ let evenRound = function (num, decimalPlaces) {
69
+ let d = decimalPlaces || 0
70
+ let m = Math.pow(10, d)
71
+ let n = +(d ? num * m : num).toFixed(8) // Avoid rounding errors
72
+ let i = Math.floor(n), f = n - i
73
+ let e = 1e-8 // Allow for rounding errors in f
74
+ let r = (f > 0.5 - e && f < 0.5 + e)
75
+ ? ((i % 2 == 0) ? i : i + 1) : Math.round(n)
76
+ return d ? r / m : r
77
+ }
78
+ let modify = async function (userfilesID, gas, type = '1') {
79
+ let data = {
80
+ f_gas: gas,
81
+ f_userfiles_id: userfilesID,
82
+ type
83
+ }
84
+ return this.$resetpost('rs/logic/modifySCGas', {data: data}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
85
+ }
86
+ let otherGasGen = async function (self) {
87
+ // 划价
88
+ let data = self.getSell()
89
+
90
+ // 获取最后一次操作
91
+ let getLastOper = await self.$resetpost('rs/logic/sale_getLastOper', {data: {f_userfiles_id: self.row.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取最后一次操作失败'})
92
+ console.log('获取最后一次的操作。。', getLastOper)
93
+
94
+ // 验证是否可以不计入补气(这里不计入补气 == 掉气补气)
95
+ // if (data.f_add_gas === '不计入' && getLastOper.data.ispick === '已过表') {
96
+ // self.$showAlert('该客户最后一次购气已过表,禁止不计入补气,请修改为计入在进行补气', 'warning', 10000)
97
+ // return
98
+ // }
99
+
100
+ data.f_total_gas = data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0)
101
+ data.f_total_fee = data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0)
102
+
103
+ // 组织划价model
104
+ let param = {
105
+ f_price_id: self.row.f_price_id,
106
+ f_userfiles_id: self.row.f_userfiles_id,
107
+ f_user_id: self.row.f_user_id,
108
+ f_meter_type: self.row.f_meter_type
109
+ }
110
+ // 若是气量卡表 temp为金额 若是金额卡表 temp为气量
111
+ if (self.isGas) {
112
+ data.f_pregas = self.model.f_pregas
113
+ // let fee = await self.$CommonService.gasCalculate(param, self.model.f_pregas)
114
+ // data.f_preamount = fee.data.chargenum
115
+ } else {
116
+ data.f_preamount = self.model.f_preamount
117
+ let gas = await self.$CommonService.feeCalculate(param, self.model.f_preamount)
118
+ data.f_pregas = gas.data.gas
119
+ }
120
+ data.f_userfiles_id = {
121
+ f_userfiles_id: self.row.f_userfiles_id,
122
+ f_user_id: self.row.f_user_id,
123
+ version: self.row.version,
124
+ f_times: self.row.cardInfo.Times + 1,
125
+ f_total_gas: data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
126
+ f_total_fee: data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
127
+ f_write_totalgas: data.f_add_gas === '计入' ? (self.row.f_write_totalgas - 0) + (self.model.f_pregas - 0) : (self.row.f_write_totalgas - 0),
128
+ f_write_totalfee: data.f_add_gas === '计入' ? (self.row.f_write_totalfee - 0) + (self.model.f_preamount - 0) : (self.row.f_write_totalfee - 0),
129
+ f_balance_gas: 0,
130
+ f_balance_amount: 0
131
+ }
132
+ if (self.row.f_meter_type === '物联网表') {
133
+ if (self.row.f_calculation === '预付费' || (self.row.f_hascard == '是' && self.row.f_calculation == '表端结算')) {
134
+ if (self.row.f_billing === '按气量') {
135
+ data.f_userfiles_id.f_balance_gas = (self.row.f_balance_gas - 0) + (self.model.f_pregas - 0)
136
+ } else {
137
+ data.f_userfiles_id.f_balance_amount = (self.row.f_balance_amount - 0) + (self.model.f_preamount - 0)
138
+ }
139
+ } else {
140
+ data.f_userinfo_id = {
141
+ f_userinfo_id: self.row.f_userinfo_id,
142
+ f_balance: (self.row.f_balance - 0) + (self.model.f_preamount - 0),
143
+ f_real_balance: (self.row.f_real_balance - 0) + (self.model.f_preamount - 0),
144
+ version: self.row.userinfo_version
145
+ }
146
+ }
147
+ } else if (self.row.f_meter_type === '机表') {
148
+ data.f_user_id.f_balance_amount = (self.row.f_balance_amount - 0) + (self.model.f_preamount - 0)
149
+ }
150
+
151
+ let cardId = self.row.f_card_id
152
+ if (self.row.f_tag && self.row.f_tag !== 'null') {
153
+ // 截取用户编号后四位
154
+ data.f_userfiles_id.f_card_id = cardId = self.row.f_tag + self.row.f_card_id
155
+ data.f_userfiles_id.f_tag = null
156
+ }
157
+
158
+ // 保存表类型
159
+ data.f_meter_type = self.row.f_meter_type
160
+ if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
161
+ data.f_times = self.row.f_times + 1
162
+ } else {
163
+ data.f_times = self.row.cardInfo.Times + 1
164
+ }
165
+
166
+ let result = await self.$resetpost('rs/logic/sale_fillGas', data, {resolveMsg: null, rejectMsg: '补气报错!!!'})
167
+
168
+ if (self.row.f_meter_type == '机表' || self.model.f_write_card === '不写卡') {
169
+ self.$showAlert('补气成功', 'success', 2000)
170
+ return result.data.id
171
+ } else {
172
+ try {
173
+ // 写卡操作
174
+ let cardParams = await self.$resetpost('rs/logic/stairCard', {data: {f_card_id: cardId + '', f_alias: self.row.f_alias, f_user_id: self.row.f_user_id}}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
175
+
176
+ // 获取写卡参数
177
+ let params = self.getWriteCard(cardParams, self.row, data)
178
+ params.kh = cardId
179
+ params.kzt = getLastOper.data.ispick === '未过表' && getLastOper.data.lastsell_oper === '发卡售气' ? '0' : '1'
180
+ if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
181
+ params.cs = self.row.f_times + 1
182
+ }
183
+ console.log('获取其他补气写卡参数,,', params)
184
+
185
+ let url = (getLastOper.data.last_oper === '补卡' || getLastOper.data.last_oper === '换表')
186
+ ? 'http://127.0.0.1:8003/WriteNewCard' : 'http://127.0.0.1:8003/WriteGasCard'
187
+
188
+ let cardRes = await self.$resetpost(url, params, {resolveMsg: null, rejectMsg: '补气卡服务错误'})
189
+
190
+ // 卡服务写卡异常,业务逻辑回滚
191
+ if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
192
+ throw new Error(`卡服务错误:${cardRes.data.Err}${cardRes.data.Exception},请联系开发人员处理!!`)
193
+ } else {
194
+ await modify(self.row.f_userfiles_id, params.ql)
195
+ await self.$CommonService.updatePassword(self.row, cardRes)
196
+ self.$showAlert('补气成功', 'success', 2000)
197
+ return result.data.id
198
+ }
199
+ } catch (error) {
200
+ self.$showAlert(error, 'danger', 0)
201
+ let rollback = {
202
+ id: result.data.id,
203
+ f_card_id: self.row.f_card_id
204
+ }
205
+ if (self.row.f_tag) {
206
+ rollback.f_tag = self.row.f_tag
207
+ }
208
+ await self.$resetpost('rs/logic/otherGasRollback', {data: rollback}, {rejectMsg: '其他补气回滚出错', resolveMsg: null})
209
+ }
210
+ }
211
+ }
212
+
213
+ let readyGen = async function (self) {
214
+ console.log('其他补气,,,', self.row)
215
+ await self.$getConfig(self, 'OtherGas')
216
+ console.log('其他补气config', self.config)
217
+ self.model.f_add_gas = [self.config.addGas]
218
+ self.model.f_write_card = self.config.writeCard
219
+ }
220
+
221
+ export default {
222
+ title: '其他补气',
223
+ data () {
224
+ return {
225
+ isGas: false,
226
+ config: {
227
+ hasPrint: false, // 默认打票
228
+ hasBillManage: false, // 默认不启用发票管理
229
+ addGas: '计入',
230
+ billType: '燃气费', // 票据类型(燃气费,其他费用,调用的发票代码不同)
231
+ printType: '普通收据', // 收据/电子票/专用发票/国税发票
232
+ payment: '现金缴费',
233
+ hasAcceptance: false, // 是否需要打印受理单
234
+ writeCard: '写卡'
235
+ },
236
+ acceptprint: false,
237
+ acceptUrl: '',
238
+ printData: {
239
+ reason: '',
240
+ fillgas: '',
241
+ fillamount: ''
242
+ },
243
+ model: {
244
+ f_write_card: '写卡',
245
+ f_pregas: 0,
246
+ f_preamount: 0,
247
+ f_reason: '',
248
+ f_add_gas: '不计入'
249
+ },
250
+
251
+ print: false,
252
+ billData: {
253
+ url: 'rs/report/acceptOtherGas_bill',
254
+ billnumber: ''
255
+ },
256
+ writecard: [{label: '写卡', value: '写卡'}, {label: '不写卡', value: '不写卡'}],
257
+ blodid: ''
258
+ }
259
+ },
260
+ props: ['row', 'cardData'],
261
+ ready () {
262
+ this.isGas = this.row.f_meter_type === '气量卡表' || this.row.f_collection_type == '按气量' || (this.row.f_calculation === '预付费' && this.row.f_billing === '按气量')
263
+ this.row.cardInfo = this.cardData
264
+ this.blodid = this.row.f_userinfo_id
265
+ console.log('卡信息', this.row.cardInfo)
266
+ readyGen(this)
267
+ },
268
+ methods: {
269
+ accept () {
270
+ // 打印受理单
271
+ console.log('其他补气model', this.model)
272
+ console.log('其他补气受累单中row', this.row)
273
+ this.printData.reason = this.model.f_comments ? `'${this.model.f_reason}'` : '' + `'${this.model.f_reason}'`
274
+ this.printData.fillgas = `'${this.model.f_pregas}'`
275
+ this.printData.fillamount = `'${this.model.f_preamount}'`
276
+ console.log('受累单中printData', this.printData)
277
+ this.acceptUrl = 'rs/report/acceptOtherGas_bill'
278
+ this.acceptprint = true
279
+ },
280
+ closeAccept () {
281
+ this.acceptprint = false
282
+ },
283
+ async confirm () {
284
+ let res = await otherGasGen(this)
285
+ if (this.config.hasPrint) {
286
+ if (this.config.hasBillManage) {
287
+ this.row.id = res
288
+ this.row.f_bill_type = '其他补气'
289
+ this.row.f_bill_style = ''
290
+ this.print = true
291
+ } else {
292
+ this.row.id = res
293
+ this.print = true
294
+ }
295
+ } else {
296
+ this.$dispatch('success')
297
+ }
298
+ },
299
+ pregas () {
300
+ // 对气量进行验证
301
+ if ((this.row.f_topup_ceil - 0) > 0 && (this.model.f_pregas - 0) > (this.row.f_topup_ceil - 0)) {
302
+ this.$showAlert(`您输入的气量不能大于该表的充值上限: ${this.row.f_topup_ceil}`, 'warning', 5000)
303
+ this.model.f_pregas = null
304
+ }
305
+ },
306
+ getSell () {
307
+ return {
308
+ f_balance: this.row.f_balance,
309
+ f_curbalance: this.row.f_balance,
310
+ f_card_id: this.row.f_card_id,
311
+ f_meternumber: this.row.f_meternumber,
312
+
313
+ f_comments: this.model.f_reason,
314
+ f_add_gas: this.model.f_add_gas[0],
315
+ f_type: '其他补气',
316
+ f_user_id: this.row.f_user_id,
317
+ f_userfiles_id: this.row.f_userfiles_id,
318
+ f_userinfo_id: this.row.f_userinfo_id,
319
+ f_user_name: this.row.f_user_name,
320
+ f_user_type: this.row.f_user_type,
321
+ f_gasproperties: this.row.f_gasproperties,
322
+ f_address: this.row.f_address,
323
+ f_meter_brand: this.row.f_meter_brand,
324
+
325
+ f_operat_type: '其他补气',
326
+ f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行其他补气操作`,
327
+ f_state: '有效',
328
+ f_operator: this.$login.f.name,
329
+ f_operatorid: this.$login.f.id,
330
+ f_orgid: this.$login.f.orgid,
331
+ f_orgname: this.$login.f.orgs,
332
+ f_depid: this.$login.f.depids,
333
+ f_depname: this.$login.f.deps,
334
+ f_zoneid: this.$login.f.zoneid,
335
+ f_zones: this.$login.f.zones
336
+ }
337
+ },
338
+ getWriteCard (cardParams, row, data) {
339
+ let params = {
340
+ factory: row.f_alias, // 气表厂家
341
+ kh: row.f_card_id, // 卡号
342
+ kmm: row.f_card_password, // 卡密码,写卡后返回新密码, 不论补卡还是先开户都没有密码
343
+ bjql: row.f_police_gas, // 报警气量,t_gasbrand表中
344
+ czsx: row.f_topup_ceil, // 充值上线,t_gasbrand表中
345
+ tzed: row.f_overdr_lines, // 透支额度,t_gasbrand表中
346
+ bkcs: row.f_fillcard_times, // 补卡次数,从补卡表里通过表编号获得
347
+ ql: evenRound(data.f_pregas - 0), // 预购气量
348
+ cs: row.cardInfo.Times + 1, // 求购气次数,先开户为1
349
+ iotTimes: row.f_iot_times, // 远传次数
350
+ money: data.f_preamount, // 购气金额
351
+ klx: row.f_coding,
352
+ kzt: '1',
353
+ dqdm: row.f_area_code,
354
+ meterid: row.f_meternumber ? row.f_meternumber : 0 // 表号
355
+ // meternumber: row.f_meternumber ? row.f_meternumber : 0
356
+ }
357
+ return Object.assign({}, this.$CommonService.writeCardParams(cardParams), params)
358
+ },
359
+ close () {
360
+ this.print = false
361
+ this.clean()
362
+ },
363
+ clean () {
364
+ this.$info('取消操作')
365
+ this.$dispatch('cancelclean', this.row)
366
+ },
367
+ printok () {
368
+ this.$dispatch('success')
369
+ }
370
+ },
371
+ computed: {
372
+ addGas () {
373
+ return [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}]
374
+ }
375
+ }
376
+ }
377
+ </script>
378
+
379
+ <style>
380
+ </style>
@@ -8,6 +8,8 @@ let specialComp = {
8
8
  // 线下写卡操作
9
9
  'un-write-card-center': (resolve) => { require(['./UnWriteCardCenter'], resolve) },
10
10
  // 补气购气
11
- 'change_fill_sendcard': (resolve) => { require(['./CardChangeFill'], resolve) }
11
+ 'change_fill_sendcard': (resolve) => { require(['./CardChangeFill'], resolve) },
12
+ // 其它补气
13
+ 'other-gas': (resolve) => { require(['./OtherGas'], resolve) }
12
14
  }
13
15
  exports.specialComp = specialComp
@@ -288,7 +288,7 @@
288
288
  <td style="text-align: center;">{{row.f_meter_state}}</td>
289
289
  <td style="text-align: center;">{{row.last_result_state}}</td>
290
290
 
291
- <td style="text-align: center;">{{row.last_resment_gas}}</td>
291
+ <td style="text-align: center;">{{row.f_shengyu_gas}}</td>
292
292
  <td>{{row.f_user_level}}</td>
293
293
  <td style="text-align: center;">{{row.f_residential_area}}</td>
294
294
  <td style="text-align: center;">{{row.f_inputtor}}</td>
@@ -353,9 +353,9 @@
353
353
  import co from 'co'
354
354
 
355
355
  let loadParamGem = async function (self) {
356
- await self.$LoadParams.loadParam(self.f_filialeid)
357
- self.initbooks()
358
- }
356
+ await self.$LoadParams.loadParam(self.f_filialeid)
357
+ self.initbooks()
358
+ }
359
359
  let modifyGen = function * (self, row, url) {
360
360
  console.log('抄表修正,。。。', row, url)
361
361
  self.cardCental = false
@@ -411,7 +411,7 @@
411
411
  'f_meter_state': '状态',
412
412
  'avggas': '平均用气量',
413
413
  'last_resment_gas': '上次用气量状态',
414
- 'last_result_state': '上次抄表表状态',
414
+ 'last_result_state': '上次抄表表状态'
415
415
  },
416
416
  meterbrands: [{label: '全部', value: ''}],
417
417
  upshow: false,
@@ -421,7 +421,7 @@
421
421
  user: []
422
422
  },
423
423
  meterbooks: [],
424
- orgCondtionStr: '',
424
+ orgCondtionStr: ''
425
425
  }
426
426
  },
427
427
  ready () {
@@ -431,7 +431,7 @@
431
431
  loadParamGem(this)
432
432
  },
433
433
  methods: {
434
- async initbooks () {
434
+ async initbooks () {
435
435
  let temp = {
436
436
  tablename: 't_meter_book',
437
437
  condition: `f_book_state='有效' and f_filiale_id='${this.$login.f.orgid}'`
@@ -555,7 +555,7 @@
555
555
  getRes (obj) {
556
556
  this.orgCondtionStr = obj
557
557
  },
558
- async selfSearch (args) {
558
+ async selfSearch (args) {
559
559
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
560
560
 
561
561
  this.startDate = this.$refs.paged.$refs.criteria.model.startDate
@@ -585,17 +585,17 @@
585
585
  console.log('选择待审核状态了', args.model)
586
586
  this.batch_audit = args.model.f_meter_state[0] !== '已抄表' && args.model.f_meter_state[0] !== '未抄表'
587
587
  }
588
- console.log("jinlaimei")
589
- await this.model.search(args.condition, this.model)
590
- console.log("jinlaimei")
591
- console.log("jinlaimei",this.model)
588
+ console.log('jinlaimei')
589
+ await this.model.search(args.condition, this.model)
590
+ console.log('jinlaimei')
591
+ console.log('jinlaimei', this.model)
592
592
 
593
- for (var i = 0; i <this.model.rows.length; i++) {
594
- console.log("jinlaimei")
595
- if (this.model.rows[i].f_meter_state === '未抄表' && this.model.rows[i].states !== 0) {
596
- this.model.rows[i].f_result_state = '正常使用'
597
- }
598
- }
593
+ for (var i = 0; i < this.model.rows.length; i++) {
594
+ console.log('jinlaimei')
595
+ if (this.model.rows[i].f_meter_state === '未抄表' && this.model.rows[i].states !== 0) {
596
+ this.model.rows[i].f_result_state = '正常使用'
597
+ }
598
+ }
599
599
  },
600
600
  reflash () {
601
601
  this.$refs.paged.$refs.criteria.search()
@@ -113,7 +113,7 @@
113
113
  // },
114
114
  async search () {
115
115
  this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userfiles_id = '${this.row.f_userfiles_id}'`
116
- let res = await this.$resetpost('rs/logic/sale_meterparamQuery', {condition: this.condition})
116
+ let res = await this.$resetpost('rs/logic/sale_meterparamQuery', {condition: this.condition}, { resolveMsg: null, rejectMsg: null })
117
117
  this.model = res.data
118
118
  // this.model.search(this.condition, this.model)
119
119
  },