sale-client 3.5.30 → 3.5.31

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.30",
3
+ "version": "3.5.31",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -56,14 +56,14 @@ export default {
56
56
  f_orgid: '',
57
57
  row: null,
58
58
  cardInfo: null,
59
- warningInfo:null,
59
+ warningInfo: null,
60
60
  modalrow: null,
61
61
  showModal: false,
62
62
  rowData: {},
63
63
  dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
64
64
  show: [true],
65
- selectFiled:'其他信息',
66
- worktype:'其他信息'
65
+ selectFiled: '其他信息',
66
+ worktype: '其他信息'
67
67
  }
68
68
  },
69
69
  ready () {
@@ -73,8 +73,8 @@ export default {
73
73
  setsustainMoney () {
74
74
  this.sustainMoney = window.localStorage.getItem('sustainMoney')
75
75
  },
76
- setField(type){
77
- this.selectFiled=type
76
+ setField (type) {
77
+ this.selectFiled = type
78
78
  this.worktype = type
79
79
  },
80
80
  async toBusiness (obj) {
@@ -83,7 +83,7 @@ export default {
83
83
  // 对此数据进行验证
84
84
  if (await this.validateRow(obj)) {
85
85
  // 获取未写卡或者写卡失败记录
86
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
86
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
87
87
  console.log('获取未写卡记录', getUnWriteSell)
88
88
  if (getUnWriteSell.data.length > 1) {
89
89
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -109,13 +109,13 @@ export default {
109
109
  console.log('查看传进来的参数:', obj)
110
110
  this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
111
111
  {data: {
112
- f_userfiles_id: obj.f_userfiles_id,
113
- f_userinfo_code: obj.f_userinfo_code,
114
- f_userinfo_id: obj.f_userinfo_id
115
- }
112
+ f_userfiles_id: obj.f_userfiles_id,
113
+ f_userinfo_code: obj.f_userinfo_code,
114
+ f_userinfo_id: obj.f_userinfo_id
115
+ }
116
116
  }
117
117
  , {resolveMsg: '', rejectMsg: '获取提示失败'})
118
- if (this.warningInfo.data.warningNum>0 && obj.f_user_state !== '预备') {
118
+ if (this.warningInfo.data.warningNum > 0 && obj.f_user_state !== '预备') {
119
119
  this.modalrow = obj
120
120
  this.showModal = true
121
121
  return false
@@ -190,8 +190,8 @@ export default {
190
190
  this.$refs.list.searchNoData()
191
191
  this.$refs.card.search()
192
192
  },
193
- 'resflushvalue'(){
194
- this.$refs.info.$refs.valueaddinfo.reflush();
193
+ 'resflushvalue' () {
194
+ this.$refs.info.$refs.valueaddinfo.reflush()
195
195
  },
196
196
  'refreshrow' (val) {
197
197
  console.log(val)
@@ -56,7 +56,7 @@ export default {
56
56
  // 对此数据进行验证
57
57
  if (await this.validateRow(obj)) {
58
58
  // 获取未写卡或者写卡失败记录
59
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
59
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
60
60
  console.log('获取未写卡记录', getUnWriteSell)
61
61
  if (getUnWriteSell.data.length > 1) {
62
62
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -56,7 +56,7 @@ export default {
56
56
  // 对此数据进行验证
57
57
  if (await this.validateRow(obj)) {
58
58
  // 获取未写卡或者写卡失败记录
59
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
59
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
60
60
  console.log('获取未写卡记录', getUnWriteSell)
61
61
  if (getUnWriteSell.data.length > 1) {
62
62
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -70,7 +70,7 @@ export default {
70
70
  // 对此数据进行验证
71
71
  if (await this.validateRow(obj)) {
72
72
  // 获取未写卡或者写卡失败记录
73
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
73
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
74
74
  console.log('获取未写卡记录', getUnWriteSell)
75
75
  if (getUnWriteSell.data.length > 1) {
76
76
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -237,6 +237,7 @@ export default {
237
237
  let data = {}
238
238
  data.param_group = this.newmeterinfo[i].name
239
239
  data.param_name = this.newmeterinfo[i].params[j].name
240
+ data.tag = this.newmeterinfo[i].params[j].tag
240
241
  data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
241
242
  data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
242
243
  data.param_lname = this.newmeterinfo[i].params[j].title
@@ -53,7 +53,7 @@ export default {
53
53
  listpage: true,
54
54
  f_orgid: '',
55
55
  row: null,
56
- state:'已领',
56
+ state: '已领',
57
57
  cardInfo: null,
58
58
  modaldata: null,
59
59
  modaldata2: null,
@@ -77,7 +77,7 @@ export default {
77
77
  this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
78
78
  if (res === 'confirm') {
79
79
  // 获取未写卡或者写卡失败记录
80
- this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
80
+ this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
81
81
  console.log('获取未写卡记录', getUnWriteSell)
82
82
  if (getUnWriteSell.data.length > 1) {
83
83
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -94,7 +94,7 @@ export default {
94
94
  })
95
95
  } else {
96
96
  // 获取未写卡或者写卡失败记录
97
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
97
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
98
98
  console.log('获取未写卡记录', getUnWriteSell)
99
99
  if (getUnWriteSell.data.length > 1) {
100
100
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -120,9 +120,9 @@ export default {
120
120
  this.$refs.list.search()
121
121
  // this.$refs.card.search()
122
122
  },
123
- setstate(state){
123
+ setstate (state) {
124
124
  console.log('-----------state----')
125
- this.state=state?'已领':'未领'
125
+ this.state = state ? '已领' : '未领'
126
126
  },
127
127
  async validateRow (obj) {
128
128
  console.log('查看传进来的参数:', obj)
@@ -1,425 +1,425 @@
1
- import Vue from 'vue'
2
- import co from 'co'
3
-
4
- let disableGen = function * (data) {
5
- let owe = yield Vue.resetpost('rs/sql/getOverdue', {data: {f_userfiles_id: data.f_userfile_id + ''}}, {resolveMsg: null, rejectMsg: null})
6
- console.log('表具停用看是否有欠费', owe.data)
7
- let hasHandplan = yield Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfile_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
8
- console.log('是否有未抄表数据', hasHandplan.data)
9
- if (owe.data.length > 0 && hasHandplan.data.length > 0) {
10
- Vue.showAlert('该表具还有欠费或者未抄表数据,不能停用!!', 'danger', 0)
11
- } else {
12
- Vue.resetpost('rs/entity/t_disable', data, {resolveMsg: '表具停用成功', rejectMsg: '表具停用失败'})
13
- }
14
- }
15
-
16
- let LogicService = {
17
- install (Vue, options) {
18
- // 给vue增添对话框显示方法
19
- Vue.LogicService = Vue.prototype.$LogicService = LogicService
20
- },
21
-
22
- // 总分表
23
- addSplit (total_id, split_tables) {
24
- let data = {
25
- total_id: total_id,
26
- split_ids: split_tables
27
- }
28
- console.log('终于到总分表保存了,,,,', data)
29
- return Vue.resetpost('rs/logic/totalsplit', {data: data}, {resolveMsg: '成功建立总分表关系', rejectMsg: '建立总分表关系出错!!!'})
30
- },
31
-
32
- // 表具启用
33
- meterEnable (model, row) {
34
- let data = {
35
- f_userfiles_id: {
36
- f_userfiles_id: row.f_userfiles_id,
37
- f_table_state: '正常',
38
- version: row.version
39
- },
40
- f_userfile_id: row.f_userfiles_id,
41
- f_user_id: row.f_user_id,
42
- record_userinfo: row.f_userinfo_id,
43
- f_userinfo_id: row.f_userinfo_id,
44
- f_user_name: row.f_user_name,
45
- f_comments: model.f_reason[0],
46
- f_othereason: model.f_othereason,
47
- f_operat_type: '启用',
48
- f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行表具启用操作`,
49
- f_state: '有效',
50
- f_operator: Vue.$login.f.name,
51
- f_operatorid: Vue.$login.f.id,
52
- f_orgid: Vue.$login.f.orgid,
53
- f_orgname: Vue.$login.f.orgs,
54
- f_depid: Vue.$login.f.depids,
55
- f_depname: Vue.$login.f.deps,
56
- f_zoneid: Vue.$login.f.zoneid,
57
- f_zones: Vue.$login.f.zones
58
- }
59
- return Vue.resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
60
- },
61
-
62
- // 表具停用
63
- meterDisable (model, row) {
64
- let data = {
65
- f_userfiles_id: {
66
- f_userfiles_id: row.f_userfiles_id,
67
- f_table_state: '停用',
68
- version: row.version
69
- },
70
- f_userfile_id: row.f_userfiles_id,
71
- f_user_id: row.f_user_id,
72
- f_userinfo_id: row.f_userinfo_id,
73
- f_user_name: row.f_user_name,
74
- f_comments: model.c,
75
- f_othereason: model.f_othereason,
76
- f_operat_type: '停用',
77
- f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行表具停用操作`,
78
- f_state: '有效',
79
- f_operator: Vue.$login.f.name,
80
- f_operatorid: Vue.$login.f.id,
81
- f_orgid: Vue.$login.f.orgid,
82
- f_orgname: Vue.$login.f.orgs,
83
- f_depid: Vue.$login.f.depids,
84
- f_depname: Vue.$login.f.deps,
85
- f_zoneid: Vue.$login.f.zoneid,
86
- f_zones: Vue.$login.f.zones
87
- }
88
- let disable = disableGen(data)
89
- return co(disable)
90
- },
91
-
92
- // 其他收费
93
- otherCharge (model, row) {
94
- let data = {
95
- f_serial_id: model.f_serial_id,
96
- record_userinfo: row.f_userinfo_id,
97
- f_serial_number: model.f_serial_number,
98
- f_userfiles_id: row.f_userfiles_id,
99
- f_user_id: row.f_user_id,
100
- // f_number: model.f_number,
101
- // f_unitprice: model.f_unitprice,
102
- f_collection: model.f_collection,
103
- f_comments: model.f_comments,
104
- f_payment: model.f_payment[0],
105
- f_voucher_number: model.f_voucher_number,
106
- f_bill_style: model.f_print[0],
107
- // f_brand_spec: model.f_brand_spec[0],
108
- f_userinfo_id: row.f_userinfo_id,
109
- f_service_person: model.f_service_person[0],
110
- f_operat_type: '其他收费',
111
- f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行其他收费操作`,
112
- f_state: '有效',
113
- f_operator: Vue.$login.f.name,
114
- f_operatorid: Vue.$login.f.id,
115
- f_orgid: Vue.$login.f.orgid,
116
- f_orgname: Vue.$login.f.orgs,
117
- f_depid: Vue.$login.f.depids,
118
- f_depname: Vue.$login.f.deps,
119
- f_zoneid: Vue.$login.f.zoneid,
120
- f_zones: Vue.$login.f.zones,
121
- // 其他费用信息
122
- t_userfees: model.t_userfees,
123
- f_fee_type: model.f_fee_type[0],
124
- f_fee_time: model.f_fee_time[0],
125
- otherdetail: model.otherdetail
126
- }
127
- return Vue.resetpost('rs/logic/sale_othercharge_logic', data, {resolveMsg: '其他收费成功', rejectMsg: '其他收费失败'})
128
- },
129
- // 维修收费
130
- repairCharge (model, row) {
131
- let data = {
132
- record_userinfo: row.f_userinfo_id,
133
- f_userfiles_id: row.f_userfiles_id,
134
- f_user_id: row.f_user_id,
135
- // f_number: model.f_number,
136
- // f_unitprice: model.f_unitprice,
137
- f_collection: model.f_collection,
138
- f_comments: model.f_comments,
139
- f_payment: model.f_payment[0],
140
- f_voucher_number: model.f_voucher_number,
141
- f_bill_style: model.f_print[0],
142
- // f_brand_spec: model.f_brand_spec[0],
143
- f_userinfo_id: row.f_userinfo_id,
144
- f_service_person: model.f_service_person[0],
145
- f_operat_type: '维修收费',
146
- f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行维修收费操作`,
147
- f_state: '有效',
148
- f_operator: Vue.$login.f.name,
149
- f_operatorid: Vue.$login.f.id,
150
- f_orgid: Vue.$login.f.orgid,
151
- f_orgname: Vue.$login.f.orgs,
152
- f_depid: Vue.$login.f.depids,
153
- f_depname: Vue.$login.f.deps,
154
- f_zoneid: Vue.$login.f.zoneid,
155
- f_zones: Vue.$login.f.zones,
156
- // 其他费用信息
157
- t_userfees: model.t_userfees,
158
- f_fee_type: model.f_fee_type[0],
159
- f_fee_time: model.f_fee_time[0],
160
- otherdetail: model.otherdetail
161
- }
162
- return Vue.resetpost('rs/logic/repaircharge', data, {resolveMsg: '维修收费成功', rejectMsg: '维修收费失败'})
163
- },
164
- // 过户管理
165
- changeAccount (model) {
166
- // console.log('过户。,。。', model)
167
- return Vue.resetpost('rs/logic/transferSave', {data: {model: model}}, {resolveMsg: '过户成功', rejectMsg: '过户失败'})
168
- },
169
-
170
- updateGasPrice (data) {
171
- // 批量变更气价
172
- return Vue.resetpost('rs/logic/updateBatchPrice', data, {resolveMsg: '批量修改成功', rejectMsg: '批量变更气价失败'})
173
- },
174
- // 增加气表品牌
175
- addGasBrand (model, Arrlist) {
176
- let data = {
177
- f_meter_brand: model.f_meter_brand,
178
- f_manufacturers: model.f_manufacturers,
179
- f_meter_type: model.f_meter_type,
180
- f_police_gas: model.f_police_gas ? model.f_police_gas : 0,
181
- f_cardnumber: model.f_cardnumber,
182
- f_card_password: model.f_card_password,
183
- f_topup_ceil: model.f_topup_ceil ? model.f_topup_ceil : 0,
184
- f_overdr_lines: model.f_overdr_lines ? model.f_overdr_lines : 0,
185
- f_meter_limit: model.f_meter_limit ? model.f_meter_limit : 0,
186
- f_checkout_limit: model.f_checkout_limit ? model.f_checkout_limit : 0,
187
- f_alias: model.f_alias,
188
- f_isdecimal: model.f_isdecimal,
189
- f_collection_type: model.f_collection_type,
190
- f_calculation: model.f_calculation,
191
- f_comments: model.f_comments,
192
- f_is_check: model.f_is_check,
193
- f_is_step: model.f_is_step,
194
- f_priority: model.f_priority,
195
- f_support_purchase: model.f_support_purchase,
196
-
197
- f_operatorid: Vue.$login.f.id,
198
- f_operator: Vue.$login.f.name,
199
- f_orgid: Vue.$login.f.orgid,
200
- f_orgname: Vue.$login.f.orgs,
201
- f_depid: Vue.$login.f.depids,
202
- f_depname: Vue.$login.f.deps,
203
-
204
- gasmodellist: Arrlist
205
- }
206
- return Vue.resetpost('rs/logic/addGasBrand', {data: data}, {resolveMsg: '添加气表成功', rejectMsg: '增加气表失败'})
207
- },
208
- // 修改气表品牌
209
- modifyGasBrand (model, Arrlist) {
210
- console.log('气表品牌保存,,', model)
211
- model.f_operatorid = Vue.$login.f.id
212
- model.f_operator = Vue.$login.f.name
213
- model.f_orgid = Vue.$login.f.orgid
214
- model.f_orgname = Vue.$login.f.orgs
215
- model.f_depid = Vue.$login.f.depids
216
- model.f_depname = Vue.$login.f.deps
217
- return Vue.resetpost('rs/logic/updataGasBrand', {data: {data: model, gasmodellist: Arrlist}}, {resolveMsg: '修改气表品牌成功', rejectMsg: '修改气表品牌失败'})
218
- },
219
- // 删除气表品牌
220
- delGasBrand (row) {
221
- console.log(row)
222
- return Vue.resetpost('rs/logic/delGasBrand', {data: {id: row.id, f_orgid: Vue.$login.f.orgid}})
223
- },
224
- deleteUsingOrg (row) {
225
- console.log(row)
226
- return Vue.resetpost('rs/logic/deleteUsingOrg', {data: {id: row.f_gasbrand_id, f_orgid: row.f_orgid}})
227
- },
228
- createMessage (data) {
229
- return Vue.resetpost('rs/logic/messageBatchOperate', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
230
- },
231
- helpInfo (model) {
232
- let data = {
233
- id: model.id,
234
- f_allowed_user: model.f_allowed_user,
235
- f_allowed_company: model.f_allowed_company,
236
- f_password: model.f_password,
237
- f_operator: model.f_operator
238
- }
239
- return Vue.resetpost('rs/logic/helpInfoAdd', {data: data})
240
- },
241
- del (model) {
242
- let data = {
243
- id: model.id
244
- }
245
- return Vue.resetpost('rs/logic/delHelpRow', {data: data})
246
- },
247
-
248
- // 抄表册
249
- gasMeterBook (model, row) {
250
- console.log('表册信息保存,,', model)
251
- let data = {
252
-
253
- f_book_name: model.f_book_name,
254
- f_inputtor: model.f_inputtor,
255
- f_period: model.f_period,
256
- f_hand_begin_date: model.f_hand_begin_date,
257
- f_hand_end_date: model.f_hand_end_date,
258
- f_book_remark: model.f_book_remark,
259
- f_filiale_id: model.f_filiale_id,
260
- f_filiale_name: model.f_filiale_name,
261
- f_comments: model.f_comments,
262
- f_state: '有效',
263
- f_operatorid: Vue.$login.f.id,
264
- f_operator: Vue.$login.f.name,
265
- f_orgid: model.f_filiale_id,
266
- f_orgname: model.f_filiale_name,
267
- f_depid: Vue.$login.f.depids,
268
- f_depname: Vue.$login.f.deps,
269
-
270
- userid: Vue.$login.f.id,
271
- type: '添加'
272
- }
273
-
274
- if (row && row.id != null) {
275
- data.id = row.id
276
- data.version = row.version
277
- data.type = '修改'
278
- }
279
- console.log('data提交之前', data)
280
- return Vue.resetpost('rs/logic/saveMeterBook', {data: data})
281
- },
282
- gasPrice (model, row) {
283
- console.log('气价保存,,', model)
284
- let data = {
285
- f_price_type: model.f_price_type,
286
- f_price_name: model.f_price_name,
287
- f_user_type: model.f_user_type,
288
- f_gasproperties: model.f_gasproperties,
289
- f_perform_date: model.f_perform_date,
290
- f_end_date: '2099-12-31 23:59:59',
291
- f_islow_income: model.f_islow_income - 0,
292
- f_limit_cycle: model.f_limit_cycle ? model.f_limit_cycle : 0,
293
- f_limit_gas: model.f_limit_gas ? model.f_limit_gas : 0,
294
-
295
- // 阶梯相关字段
296
- f_stairmonths: null,
297
- f_population_base: null,
298
- f_stair_start_date: null,
299
-
300
- f_isheat: model.f_isheat - 0,
301
- f_deduction_way: model.f_deduction_way,
302
- // 采暖季相关字段
303
- f_heat_start_date: model.f_heat_start_date ? model.f_heat_start_date : null,
304
- f_heat_cycle: model.f_heat_cycle ? model.f_heat_cycle : null,
305
-
306
- f_priority: model.f_priority,
307
- f_comments: model.f_comments,
308
- f_state: '有效',
309
- f_operatorid: Vue.$login.f.id,
310
- f_operator: Vue.$login.f.name,
311
- f_orgid: Vue.$login.f.orgid,
312
- f_orgname: Vue.$login.f.orgs,
313
- f_depid: Vue.$login.f.depids,
314
- f_depname: Vue.$login.f.deps,
315
-
316
- // 所属分公司
317
- f_filialeid: model.f_filialeid,
318
- f_filialename: model.f_filialename,
319
-
320
- detailprice: model.detailprice,
321
- f_processid: model.f_processid,
322
- userid: Vue.$login.f.id,
323
- audit: model.audit,
324
- type: '添加'
325
- }
326
-
327
- if (model.toBeUsePriceId && model.toBeUsePriceVersion) {
328
- // 待使用 气价的id
329
- data.toBeUsePriceId = model.toBeUsePriceId
330
- data.toBeUsePriceVersion = model.toBeUsePriceVersion
331
- }
332
-
333
- if (model.limit_gas) {
334
- data.limit_gas = model.limit_gas
335
- }
336
-
337
- if (data.purchaselimit) {
338
- data.purchaselimit.forEach((item, index) => {
339
- data.purchaselimit[index].value = model.purchaselimit[index].value
340
- })
341
- }
342
- if (data.f_price_type === '固定气价') {
343
- if (data.detailprice[0].id) {
344
- delete data.detailprice[0].id
345
- }
346
- data.detailprice[0].f_price_name = 1
347
- } else if (data.f_price_type === '混合气价') {
348
- if (delete data.detailprice[0].id) {
349
- delete data.detailprice[0].id
350
- }
351
- data.detailprice[0].f_price_name = 1
352
- data.detailprice[0].f_mixprice = model.detailprice[0].f_mixprice[0]
353
- if (delete data.detailprice[1].id) {
354
- delete data.detailprice[1].id
355
- }
356
- data.detailprice[1].f_price_name = 2
357
- data.detailprice[1].f_mixprice = model.detailprice[1].f_mixprice[0]
358
- } else if (data.f_price_type === '阶梯气价') {
359
- data.f_stairmonths = model.f_stairmonths
360
- data.f_population_base = model.f_population_base
361
- data.f_stair_start_date = model.f_stair_start_date
362
- data.detailprice.forEach((item, index) => {
363
- data.detailprice[index].f_price_name = index + 1
364
- if (data.detailprice[index].id) {
365
- if (delete data.detailprice[index].id) {
366
- delete data.detailprice[index].id
367
- }
368
- } else if (data.detailprice[index].f_ratio) {
369
- data.detailprice[index].f_ratio = null
370
- } else if (!data.detailprice[index].f_add_gas) {
371
- data.detailprice[index].f_add_gas = 0
372
- } else if (!data.detailprice[index].f_add_gas_heat) {
373
- data.detailprice[index].f_add_gas_heat = 0
374
- }
375
- })
376
- }
377
- if (row && row.id != null) {
378
- data.oldprice = {
379
- id: row.id
380
- }
381
- data.type = '修改'
382
- data.f_price_id = row.f_price_id
383
- data.f_version = (row.f_version - 0)
384
- }
385
- console.log('data提交之前', data)
386
- return Vue.resetpost('rs/logic/gasprice', {data: data})
387
- },
388
- basicLiving (model, row) {
389
- console.log('看传过来的model')
390
- console.log(model)
391
- let data = {
392
- f_userinfo_id: model.f_userinfo_id,
393
- f_userfiles_id: model.f_userfiles_id,
394
- f_start_date: model.f_start_date,
395
- f_end_date: model.f_end_date,
396
- // f_period: model.f_period,
397
- f_state: '有效',
398
- f_price_id: model.f_price_id,
399
- f_operatorid: Vue.$login.f.id,
400
- f_operator: Vue.$login.f.name,
401
- f_orgid: Vue.$login.f.orgid,
402
- f_orgname: Vue.$login.f.orgs,
403
- f_depid: Vue.$login.f.depids,
404
- f_depname: Vue.$login.f.deps,
405
-
406
- type: '添加'
407
- }
408
- if (row && row.id != null) {
409
- data.oldbasicliving = {
410
- id: row.id
411
- }
412
- data.type = '修改'
413
- }
414
- console.log('data提交之前', data)
415
- return Vue.resetpost('rs/logic/addBasicLiving', {data: data})
416
- },
417
- sendMessage (condition) {
418
- return Vue.resetpost('rs/logic/sendSms', {condition: condition})
419
- },
420
- deletMessage (condition) {
421
- return Vue.resetpost('rs/logic/deleteSms', {condition: condition}, {resolveMsg: '删除短信成功', rejectMsg: '删除短信失败'})
422
- }
423
- }
424
-
425
- export default LogicService
1
+ import Vue from 'vue'
2
+ import co from 'co'
3
+
4
+ let disableGen = function * (data) {
5
+ let owe = yield Vue.resetpost('rs/sql/getOverdue', {data: {f_userfiles_id: data.f_userfile_id + ''}}, {resolveMsg: null, rejectMsg: null})
6
+ console.log('表具停用看是否有欠费', owe.data)
7
+ let hasHandplan = yield Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfile_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
8
+ console.log('是否有未抄表数据', hasHandplan.data)
9
+ if (owe.data.length > 0 && hasHandplan.data.length > 0) {
10
+ Vue.showAlert('该表具还有欠费或者未抄表数据,不能停用!!', 'danger', 0)
11
+ } else {
12
+ Vue.resetpost('rs/entity/t_disable', data, {resolveMsg: '表具停用成功', rejectMsg: '表具停用失败'})
13
+ }
14
+ }
15
+
16
+ let LogicService = {
17
+ install (Vue, options) {
18
+ // 给vue增添对话框显示方法
19
+ Vue.LogicService = Vue.prototype.$LogicService = LogicService
20
+ },
21
+
22
+ // 总分表
23
+ addSplit (total_id, split_tables) {
24
+ let data = {
25
+ total_id: total_id,
26
+ split_ids: split_tables
27
+ }
28
+ console.log('终于到总分表保存了,,,,', data)
29
+ return Vue.resetpost('rs/logic/totalsplit', {data: data}, {resolveMsg: '成功建立总分表关系', rejectMsg: '建立总分表关系出错!!!'})
30
+ },
31
+
32
+ // 表具启用
33
+ meterEnable (model, row) {
34
+ let data = {
35
+ f_userfiles_id: {
36
+ f_userfiles_id: row.f_userfiles_id,
37
+ f_table_state: '正常',
38
+ version: row.version
39
+ },
40
+ f_userfile_id: row.f_userfiles_id,
41
+ f_user_id: row.f_user_id,
42
+ record_userinfo: row.f_userinfo_id,
43
+ f_userinfo_id: row.f_userinfo_id,
44
+ f_user_name: row.f_user_name,
45
+ f_comments: model.f_reason[0],
46
+ f_othereason: model.f_othereason,
47
+ f_operat_type: '启用',
48
+ f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行表具启用操作`,
49
+ f_state: '有效',
50
+ f_operator: Vue.$login.f.name,
51
+ f_operatorid: Vue.$login.f.id,
52
+ f_orgid: Vue.$login.f.orgid,
53
+ f_orgname: Vue.$login.f.orgs,
54
+ f_depid: Vue.$login.f.depids,
55
+ f_depname: Vue.$login.f.deps,
56
+ f_zoneid: Vue.$login.f.zoneid,
57
+ f_zones: Vue.$login.f.zones
58
+ }
59
+ return Vue.resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
60
+ },
61
+
62
+ // 表具停用
63
+ meterDisable (model, row) {
64
+ let data = {
65
+ f_userfiles_id: {
66
+ f_userfiles_id: row.f_userfiles_id,
67
+ f_table_state: '停用',
68
+ version: row.version
69
+ },
70
+ f_userfile_id: row.f_userfiles_id,
71
+ f_user_id: row.f_user_id,
72
+ f_userinfo_id: row.f_userinfo_id,
73
+ f_user_name: row.f_user_name,
74
+ f_comments: model.c,
75
+ f_othereason: model.f_othereason,
76
+ f_operat_type: '停用',
77
+ f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行表具停用操作`,
78
+ f_state: '有效',
79
+ f_operator: Vue.$login.f.name,
80
+ f_operatorid: Vue.$login.f.id,
81
+ f_orgid: Vue.$login.f.orgid,
82
+ f_orgname: Vue.$login.f.orgs,
83
+ f_depid: Vue.$login.f.depids,
84
+ f_depname: Vue.$login.f.deps,
85
+ f_zoneid: Vue.$login.f.zoneid,
86
+ f_zones: Vue.$login.f.zones
87
+ }
88
+ let disable = disableGen(data)
89
+ return co(disable)
90
+ },
91
+
92
+ // 其他收费
93
+ otherCharge (model, row) {
94
+ let data = {
95
+ f_serial_id: model.f_serial_id,
96
+ record_userinfo: row.f_userinfo_id,
97
+ f_serial_number: model.f_serial_number,
98
+ f_userfiles_id: row.f_userfiles_id,
99
+ f_user_id: row.f_user_id,
100
+ // f_number: model.f_number,
101
+ // f_unitprice: model.f_unitprice,
102
+ f_collection: model.f_collection,
103
+ f_comments: model.f_comments,
104
+ f_payment: model.f_payment[0],
105
+ f_voucher_number: model.f_voucher_number,
106
+ f_bill_style: model.f_print[0],
107
+ // f_brand_spec: model.f_brand_spec[0],
108
+ f_userinfo_id: row.f_userinfo_id,
109
+ f_service_person: model.f_service_person[0],
110
+ f_operat_type: '其他收费',
111
+ f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行其他收费操作`,
112
+ f_state: '有效',
113
+ f_operator: Vue.$login.f.name,
114
+ f_operatorid: Vue.$login.f.id,
115
+ f_orgid: Vue.$login.f.orgid,
116
+ f_orgname: Vue.$login.f.orgs,
117
+ f_depid: Vue.$login.f.depids,
118
+ f_depname: Vue.$login.f.deps,
119
+ f_zoneid: Vue.$login.f.zoneid,
120
+ f_zones: Vue.$login.f.zones,
121
+ // 其他费用信息
122
+ t_userfees: model.t_userfees,
123
+ f_fee_type: model.f_fee_type[0],
124
+ f_fee_time: model.f_fee_time[0],
125
+ otherdetail: model.otherdetail
126
+ }
127
+ return Vue.resetpost('rs/logic/sale_othercharge_logic', data, {resolveMsg: '其他收费成功', rejectMsg: '其他收费失败'})
128
+ },
129
+ // 维修收费
130
+ repairCharge (model, row) {
131
+ let data = {
132
+ record_userinfo: row.f_userinfo_id,
133
+ f_userfiles_id: row.f_userfiles_id,
134
+ f_user_id: row.f_user_id,
135
+ // f_number: model.f_number,
136
+ // f_unitprice: model.f_unitprice,
137
+ f_collection: model.f_collection,
138
+ f_comments: model.f_comments,
139
+ f_payment: model.f_payment[0],
140
+ f_voucher_number: model.f_voucher_number,
141
+ f_bill_style: model.f_print[0],
142
+ // f_brand_spec: model.f_brand_spec[0],
143
+ f_userinfo_id: row.f_userinfo_id,
144
+ f_service_person: model.f_service_person[0],
145
+ f_operat_type: '维修收费',
146
+ f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行维修收费操作`,
147
+ f_state: '有效',
148
+ f_operator: Vue.$login.f.name,
149
+ f_operatorid: Vue.$login.f.id,
150
+ f_orgid: Vue.$login.f.orgid,
151
+ f_orgname: Vue.$login.f.orgs,
152
+ f_depid: Vue.$login.f.depids,
153
+ f_depname: Vue.$login.f.deps,
154
+ f_zoneid: Vue.$login.f.zoneid,
155
+ f_zones: Vue.$login.f.zones,
156
+ // 其他费用信息
157
+ t_userfees: model.t_userfees,
158
+ f_fee_type: model.f_fee_type[0],
159
+ f_fee_time: model.f_fee_time[0],
160
+ otherdetail: model.otherdetail
161
+ }
162
+ return Vue.resetpost('rs/logic/repaircharge', data, {resolveMsg: '维修收费成功', rejectMsg: '维修收费失败'})
163
+ },
164
+ // 过户管理
165
+ changeAccount (model) {
166
+ // console.log('过户。,。。', model)
167
+ return Vue.resetpost('rs/logic/transferSave', {data: {model: model}}, {resolveMsg: '过户成功', rejectMsg: '过户失败'})
168
+ },
169
+
170
+ updateGasPrice (data) {
171
+ // 批量变更气价
172
+ return Vue.resetpost('rs/logic/updateBatchPrice', data, {resolveMsg: '批量修改成功', rejectMsg: '批量变更气价失败'})
173
+ },
174
+ // 增加气表品牌
175
+ addGasBrand (model, Arrlist) {
176
+ let data = {
177
+ f_meter_brand: model.f_meter_brand,
178
+ f_manufacturers: model.f_manufacturers,
179
+ f_meter_type: model.f_meter_type,
180
+ f_police_gas: model.f_police_gas ? model.f_police_gas : 0,
181
+ f_cardnumber: model.f_cardnumber,
182
+ f_card_password: model.f_card_password,
183
+ f_topup_ceil: model.f_topup_ceil ? model.f_topup_ceil : 0,
184
+ f_overdr_lines: model.f_overdr_lines ? model.f_overdr_lines : 0,
185
+ f_meter_limit: model.f_meter_limit ? model.f_meter_limit : 0,
186
+ f_checkout_limit: model.f_checkout_limit ? model.f_checkout_limit : 0,
187
+ f_alias: model.f_alias,
188
+ f_isdecimal: model.f_isdecimal,
189
+ f_collection_type: model.f_collection_type,
190
+ f_calculation: model.f_calculation,
191
+ f_comments: model.f_comments,
192
+ f_is_check: model.f_is_check,
193
+ f_is_step: model.f_is_step,
194
+ f_priority: model.f_priority,
195
+ f_support_purchase: model.f_support_purchase,
196
+
197
+ f_operatorid: Vue.$login.f.id,
198
+ f_operator: Vue.$login.f.name,
199
+ f_orgid: Vue.$login.f.orgid,
200
+ f_orgname: Vue.$login.f.orgs,
201
+ f_depid: Vue.$login.f.depids,
202
+ f_depname: Vue.$login.f.deps,
203
+
204
+ gasmodellist: Arrlist
205
+ }
206
+ return Vue.resetpost('rs/logic/addGasBrand', {data: data}, {resolveMsg: '添加气表成功', rejectMsg: '增加气表失败'})
207
+ },
208
+ // 修改气表品牌
209
+ modifyGasBrand (model, Arrlist) {
210
+ console.log('气表品牌保存,,', model)
211
+ model.f_operatorid = Vue.$login.f.id
212
+ model.f_operator = Vue.$login.f.name
213
+ model.f_orgid = Vue.$login.f.orgid
214
+ model.f_orgname = Vue.$login.f.orgs
215
+ model.f_depid = Vue.$login.f.depids
216
+ model.f_depname = Vue.$login.f.deps
217
+ return Vue.resetpost('rs/logic/updataGasBrand', {data: {data: model, gasmodellist: Arrlist}}, {resolveMsg: '修改气表品牌成功', rejectMsg: '修改气表品牌失败'})
218
+ },
219
+ // 删除气表品牌
220
+ delGasBrand (row) {
221
+ console.log(row)
222
+ return Vue.resetpost('rs/logic/delGasBrand', {data: {id: row.id, f_orgid: Vue.$login.f.orgid}})
223
+ },
224
+ deleteUsingOrg (row) {
225
+ console.log(row)
226
+ return Vue.resetpost('rs/logic/deleteUsingOrg', {data: {id: row.f_gasbrand_id, f_orgid: row.f_orgid}})
227
+ },
228
+ createMessage (data) {
229
+ return Vue.resetpost('rs/logic/messageBatchOperate', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
230
+ },
231
+ helpInfo (model) {
232
+ let data = {
233
+ id: model.id,
234
+ f_allowed_user: model.f_allowed_user,
235
+ f_allowed_company: model.f_allowed_company,
236
+ f_password: model.f_password,
237
+ f_operator: model.f_operator
238
+ }
239
+ return Vue.resetpost('rs/logic/helpInfoAdd', {data: data})
240
+ },
241
+ del (model) {
242
+ let data = {
243
+ id: model.id
244
+ }
245
+ return Vue.resetpost('rs/logic/delHelpRow', {data: data})
246
+ },
247
+
248
+ // 抄表册
249
+ gasMeterBook (model, row) {
250
+ console.log('表册信息保存,,', model)
251
+ let data = {
252
+
253
+ f_book_name: model.f_book_name,
254
+ f_inputtor: model.f_inputtor,
255
+ f_period: model.f_period,
256
+ f_hand_begin_date: model.f_hand_begin_date,
257
+ f_hand_end_date: model.f_hand_end_date,
258
+ f_book_remark: model.f_book_remark,
259
+ f_filiale_id: model.f_filiale_id,
260
+ f_filiale_name: model.f_filiale_name,
261
+ f_comments: model.f_comments,
262
+ f_state: '有效',
263
+ f_operatorid: Vue.$login.f.id,
264
+ f_operator: Vue.$login.f.name,
265
+ f_orgid: model.f_filiale_id,
266
+ f_orgname: model.f_filiale_name,
267
+ f_depid: Vue.$login.f.depids,
268
+ f_depname: Vue.$login.f.deps,
269
+
270
+ userid: Vue.$login.f.id,
271
+ type: '添加'
272
+ }
273
+
274
+ if (row && row.id != null) {
275
+ data.id = row.id
276
+ data.version = row.version
277
+ data.type = '修改'
278
+ }
279
+ console.log('data提交之前', data)
280
+ return Vue.resetpost('rs/logic/saveMeterBook', {data: data})
281
+ },
282
+ gasPrice (model, row) {
283
+ console.log('气价保存,,', model)
284
+ let data = {
285
+ f_price_type: model.f_price_type,
286
+ f_price_name: model.f_price_name,
287
+ f_user_type: model.f_user_type,
288
+ f_gasproperties: model.f_gasproperties,
289
+ f_perform_date: model.f_perform_date,
290
+ f_end_date: '2099-12-31 23:59:59',
291
+ f_islow_income: model.f_islow_income - 0,
292
+ f_limit_cycle: model.f_limit_cycle ? model.f_limit_cycle : 0,
293
+ f_limit_gas: model.f_limit_gas ? model.f_limit_gas : 0,
294
+
295
+ // 阶梯相关字段
296
+ f_stairmonths: null,
297
+ f_population_base: null,
298
+ f_stair_start_date: null,
299
+
300
+ f_isheat: model.f_isheat - 0,
301
+ f_deduction_way: model.f_deduction_way,
302
+ // 采暖季相关字段
303
+ f_heat_start_date: model.f_heat_start_date ? model.f_heat_start_date : null,
304
+ f_heat_cycle: model.f_heat_cycle ? model.f_heat_cycle : null,
305
+
306
+ f_priority: model.f_priority,
307
+ f_comments: model.f_comments,
308
+ f_state: '有效',
309
+ f_operatorid: Vue.$login.f.id,
310
+ f_operator: Vue.$login.f.name,
311
+ f_orgid: Vue.$login.f.orgid,
312
+ f_orgname: Vue.$login.f.orgs,
313
+ f_depid: Vue.$login.f.depids,
314
+ f_depname: Vue.$login.f.deps,
315
+
316
+ // 所属分公司
317
+ f_filialeid: model.f_filialeid,
318
+ f_filialename: model.f_filialename,
319
+
320
+ detailprice: model.detailprice,
321
+ f_processid: model.f_processid,
322
+ userid: Vue.$login.f.id,
323
+ audit: model.audit,
324
+ type: '添加'
325
+ }
326
+
327
+ if (model.toBeUsePriceId && model.toBeUsePriceVersion) {
328
+ // 待使用 气价的id
329
+ data.toBeUsePriceId = model.toBeUsePriceId
330
+ data.toBeUsePriceVersion = model.toBeUsePriceVersion
331
+ }
332
+
333
+ if (model.limit_gas) {
334
+ data.limit_gas = model.limit_gas
335
+ }
336
+
337
+ if (data.purchaselimit) {
338
+ data.purchaselimit.forEach((item, index) => {
339
+ data.purchaselimit[index].value = model.purchaselimit[index].value
340
+ })
341
+ }
342
+ if (data.f_price_type === '固定气价') {
343
+ if (data.detailprice[0].id) {
344
+ delete data.detailprice[0].id
345
+ }
346
+ data.detailprice[0].f_price_name = 1
347
+ } else if (data.f_price_type === '混合气价') {
348
+ if (delete data.detailprice[0].id) {
349
+ delete data.detailprice[0].id
350
+ }
351
+ data.detailprice[0].f_price_name = 1
352
+ data.detailprice[0].f_mixprice = model.detailprice[0].f_mixprice[0]
353
+ if (delete data.detailprice[1].id) {
354
+ delete data.detailprice[1].id
355
+ }
356
+ data.detailprice[1].f_price_name = 2
357
+ data.detailprice[1].f_mixprice = model.detailprice[1].f_mixprice[0]
358
+ } else if (data.f_price_type === '阶梯气价') {
359
+ data.f_stairmonths = model.f_stairmonths
360
+ data.f_population_base = model.f_population_base
361
+ data.f_stair_start_date = model.f_stair_start_date
362
+ data.detailprice.forEach((item, index) => {
363
+ data.detailprice[index].f_price_name = index + 1
364
+ if (data.detailprice[index].id) {
365
+ if (delete data.detailprice[index].id) {
366
+ delete data.detailprice[index].id
367
+ }
368
+ } else if (data.detailprice[index].f_ratio) {
369
+ data.detailprice[index].f_ratio = null
370
+ } else if (!data.detailprice[index].f_add_gas) {
371
+ data.detailprice[index].f_add_gas = 0
372
+ } else if (!data.detailprice[index].f_add_gas_heat) {
373
+ data.detailprice[index].f_add_gas_heat = 0
374
+ }
375
+ })
376
+ }
377
+ if (row && row.id != null) {
378
+ data.oldprice = {
379
+ id: row.id
380
+ }
381
+ data.type = '修改'
382
+ data.f_price_id = row.f_price_id
383
+ data.f_version = (row.f_version - 0)
384
+ }
385
+ console.log('data提交之前', data)
386
+ return Vue.resetpost('rs/logic/gasprice', {data: data})
387
+ },
388
+ basicLiving (model, row) {
389
+ console.log('看传过来的model')
390
+ console.log(model)
391
+ let data = {
392
+ f_userinfo_id: model.f_userinfo_id,
393
+ f_userfiles_id: model.f_userfiles_id,
394
+ f_start_date: model.f_start_date,
395
+ f_end_date: model.f_end_date,
396
+ // f_period: model.f_period,
397
+ f_state: '有效',
398
+ f_price_id: model.f_price_id,
399
+ f_operatorid: Vue.$login.f.id,
400
+ f_operator: Vue.$login.f.name,
401
+ f_orgid: Vue.$login.f.orgid,
402
+ f_orgname: Vue.$login.f.orgs,
403
+ f_depid: Vue.$login.f.depids,
404
+ f_depname: Vue.$login.f.deps,
405
+
406
+ type: '添加'
407
+ }
408
+ if (row && row.id != null) {
409
+ data.oldbasicliving = {
410
+ id: row.id
411
+ }
412
+ data.type = '修改'
413
+ }
414
+ console.log('data提交之前', data)
415
+ return Vue.resetpost('rs/logic/addBasicLiving', {data: data})
416
+ },
417
+ sendMessage (condition) {
418
+ return Vue.resetpost('rs/logic/sendSms', {condition: condition})
419
+ },
420
+ deletMessage (condition) {
421
+ return Vue.resetpost('rs/logic/deleteSms', {condition: condition}, {resolveMsg: '删除短信成功', rejectMsg: '删除短信失败'})
422
+ }
423
+ }
424
+
425
+ export default LogicService
@@ -67,7 +67,7 @@ export default {
67
67
  // 对此数据进行验证
68
68
  if (await this.validateRow(obj)) {
69
69
  // 获取未写卡或者写卡失败记录
70
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
70
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
71
71
  console.log('获取未写卡记录', getUnWriteSell)
72
72
  if (getUnWriteSell.data.length > 1) {
73
73
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -70,7 +70,7 @@ export default {
70
70
  // 对此数据进行验证
71
71
  if (await this.validateRow(obj)) {
72
72
  // 获取未写卡或者写卡失败记录
73
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
73
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
74
74
  console.log('获取未写卡记录', getUnWriteSell)
75
75
  if (getUnWriteSell.data.length > 1) {
76
76
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -51,19 +51,19 @@ export default {
51
51
  f_orgid: '',
52
52
  row: null,
53
53
  cardInfo: null,
54
- warningInfo:null,
54
+ warningInfo: null,
55
55
  modalrow: null,
56
56
  showModal: false,
57
57
  rowData: {},
58
58
  dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
59
59
  show: [true],
60
- selectFiled:'其他信息',
61
- worktype:'其他信息'
60
+ selectFiled: '其他信息',
61
+ worktype: '其他信息'
62
62
  }
63
63
  },
64
64
  methods: {
65
- setField(type){
66
- this.selectFiled=type
65
+ setField (type) {
66
+ this.selectFiled = type
67
67
  this.worktype = type
68
68
  },
69
69
  async toBusiness (obj) {
@@ -72,7 +72,7 @@ export default {
72
72
  // 对此数据进行验证
73
73
  if (await this.validateRow(obj)) {
74
74
  // 获取未写卡或者写卡失败记录
75
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
75
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
76
76
  console.log('获取未写卡记录', getUnWriteSell)
77
77
  if (getUnWriteSell.data.length > 1) {
78
78
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -98,13 +98,13 @@ export default {
98
98
  console.log('查看传进来的参数:', obj)
99
99
  this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
100
100
  {data: {
101
- f_userfiles_id: obj.f_userfiles_id,
102
- f_userinfo_code: obj.f_userinfo_code,
103
- f_userinfo_id: obj.f_userinfo_id
104
- }
101
+ f_userfiles_id: obj.f_userfiles_id,
102
+ f_userinfo_code: obj.f_userinfo_code,
103
+ f_userinfo_id: obj.f_userinfo_id
104
+ }
105
105
  }
106
106
  , {resolveMsg: '', rejectMsg: '获取提示失败'})
107
- if ((!this.warningInfo.data.state.info || !this.warningInfo.data.state.dibao || !this.warningInfo.data.state.ins|| !this.warningInfo.data.state.blacklist || !this.warningInfo.data.state.invoice) && obj.f_user_state !== '预备') {
107
+ if ((!this.warningInfo.data.state.info || !this.warningInfo.data.state.dibao || !this.warningInfo.data.state.ins || !this.warningInfo.data.state.blacklist || !this.warningInfo.data.state.invoice) && obj.f_user_state !== '预备') {
108
108
  this.modalrow = obj
109
109
  this.showModal = true
110
110
  return false
@@ -177,8 +177,8 @@ export default {
177
177
  this.$refs.list.searchNoData()
178
178
  this.$refs.card.search()
179
179
  },
180
- 'resflushvalue'(){
181
- this.$refs.info.$refs.valueaddinfo.reflush();
180
+ 'resflushvalue' () {
181
+ this.$refs.info.$refs.valueaddinfo.reflush()
182
182
  },
183
183
  'refreshrow' (val) {
184
184
  console.log(val)
@@ -67,7 +67,7 @@ export default {
67
67
  // 对此数据进行验证
68
68
  if (await this.validateRow(obj)) {
69
69
  // 获取未写卡或者写卡失败记录
70
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
70
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
71
71
  console.log('获取未写卡记录', getUnWriteSell)
72
72
  if (getUnWriteSell.data.length > 1) {
73
73
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -70,7 +70,7 @@ export default {
70
70
  this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
71
71
  if (res === 'confirm') {
72
72
  // 获取未写卡或者写卡失败记录
73
- this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
73
+ this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
74
74
  console.log('获取未写卡记录', getUnWriteSell)
75
75
  if (getUnWriteSell.data.length > 1) {
76
76
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -87,7 +87,7 @@ export default {
87
87
  })
88
88
  } else {
89
89
  // 获取未写卡或者写卡失败记录
90
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
90
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
91
91
  console.log('获取未写卡记录', getUnWriteSell)
92
92
  if (getUnWriteSell.data.length > 1) {
93
93
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -142,7 +142,7 @@ export default {
142
142
  // 对此数据进行验证
143
143
  if (await this.validateRow(obj)) {
144
144
  // 获取未写卡或者写卡失败记录
145
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
145
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
146
146
  if (getUnWriteSell.data.length > 1) {
147
147
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
148
148
  } else {
@@ -51,7 +51,7 @@
51
51
  export default {
52
52
  title: '用户操作',
53
53
  components: {
54
- ChargeList, ChargeOper,SafeCheck,ServiceRepair,WorkOrderInfo
54
+ ChargeList, ChargeOper, SafeCheck, ServiceRepair, WorkOrderInfo
55
55
  },
56
56
  data () {
57
57
  return {
@@ -76,7 +76,7 @@ export default {
76
76
  // 对此数据进行验证
77
77
  if (await this.validateRow(obj)) {
78
78
  // 获取未写卡或者写卡失败记录
79
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
79
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
80
80
  console.log('获取未写卡记录', getUnWriteSell)
81
81
  if (getUnWriteSell.data.length > 1) {
82
82
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -70,7 +70,7 @@ export default {
70
70
  // 对此数据进行验证
71
71
  if (await this.validateRow(obj)) {
72
72
  // 获取未写卡或者写卡失败记录
73
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
73
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
74
74
  console.log('获取未写卡记录', getUnWriteSell)
75
75
  if (getUnWriteSell.data.length > 1) {
76
76
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -38,7 +38,6 @@
38
38
  </div>
39
39
  </template>
40
40
  <script>
41
-
42
41
  import {HttpResetClass} from 'vue-client'
43
42
 
44
43
  export default {
@@ -54,7 +53,7 @@ export default {
54
53
  modaldata2: null,
55
54
  modalrow: null,
56
55
  showModal: false,
57
- warningInfo:{},
56
+ warningInfo: {},
58
57
  rowData: {},
59
58
  dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
60
59
  show: [true]
@@ -68,7 +67,7 @@ export default {
68
67
  // 对此数据进行验证
69
68
  if (await this.validateRow(obj)) {
70
69
  // 获取未写卡或者写卡失败记录
71
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
70
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
72
71
  console.log('获取未写卡记录', getUnWriteSell)
73
72
  if (getUnWriteSell.data.length > 1) {
74
73
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -106,7 +105,7 @@ export default {
106
105
  // this.showModal = true
107
106
  // return false
108
107
  // } else {
109
- return true
108
+ return true
110
109
  // }
111
110
  },
112
111
  clean () {
@@ -75,7 +75,7 @@ export default {
75
75
  this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
76
76
  if (res === 'confirm') {
77
77
  // 获取未写卡或者写卡失败记录
78
- this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
78
+ this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
79
79
  console.log('获取未写卡记录', getUnWriteSell)
80
80
  if (getUnWriteSell.data.length > 1) {
81
81
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)
@@ -92,7 +92,7 @@ export default {
92
92
  })
93
93
  } else {
94
94
  // 获取未写卡或者写卡失败记录
95
- let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
95
+ let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
96
96
  console.log('获取未写卡记录', getUnWriteSell)
97
97
  if (getUnWriteSell.data.length > 1) {
98
98
  this.$showAlert('此卡已缴费多次未写卡。请核实后处理!!', 'warning', 5000)