sale-client 3.6.129 → 3.6.130

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.
@@ -1,5 +1,5 @@
1
1
  var path = require('path')
2
- const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
2
+ const [ serverRul, localUrl ] = ['https://qnjtkf.cn:7400/#', 'https://qnjtkf.cn:7400/#']
3
3
  var merge = require('webpack-merge')
4
4
  var baseConfig = require('./webpack.dev.conf')
5
5
  var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
20
20
  '/rs/file': {
21
21
  target: serverRul
22
22
  },
23
+ '/rs/business': {
24
+ target: localUrl
25
+ },
23
26
  '/rs/sql/singleTable': {
24
27
  target: serverRul
25
28
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.129",
3
+ "version": "3.6.130",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -193,6 +193,22 @@
193
193
  */
194
194
  let reprintBatchGen = function *(self, row) {
195
195
  try {
196
+ // 验证是否全部收完
197
+ let res = yield self.$resetpost('rs/sql/querySingleTable',
198
+ {
199
+ data: {
200
+ items: 'count(id) count',
201
+ tablename: 't_sellinggas',
202
+ condition: `f_batch_id = '${row.id}' and f_operate_date >= '${row.f_operate_date}'`
203
+ }
204
+ },
205
+ {resolveMsg: null, rejectMsg: null}).catch((error) => {
206
+ console.log('异常提示:' + error)
207
+ })
208
+ if (res.data[0].count !== row.f_charge_user) {
209
+ self.$showMessage('该批次未全部收完,不能打印票据明细')
210
+ return
211
+ }
196
212
  row.f_bill_type = row.type
197
213
  row.f_bill_style = '普通收据'
198
214
  row.f_operator = self.$login.f.name
@@ -387,7 +403,7 @@ and th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
387
403
  this.cancel_show = false
388
404
  },
389
405
  cancelSucc () {
390
- console.log("-----------------------------撤销成功了,隐藏掉")
406
+ console.log('-----------------------------撤销成功了,隐藏掉')
391
407
  this.cancel_show = false
392
408
  this.$dispatch('refresh')
393
409
  },
@@ -0,0 +1,892 @@
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main" @keyup.enter="search">
4
+ <div class="flex" v-if="!show">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row">
9
+ <div class="col-sm-2 form-group">
10
+
11
+ <label for="startDate" class="font_normal_body" title="归属日期">开始日期</label>
12
+ <datepicker id="startDate" placeholder="开始日期" style="width:60%"
13
+ v-model="model.startDate"
14
+ :value.sync="model.startDate"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="true"
17
+ >
18
+ </datepicker>
19
+ </div>
20
+ <div class="col-sm-2 form-group">
21
+ <label for="endDate" class="font_normal_body" title="归属日期">结束日期</label>
22
+ <datepicker id="endDate" placeholder="结束日期" style="width:60%"
23
+ v-model="model.endDate"
24
+ :value.sync="model.endDate"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="true"
27
+ >
28
+ </datepicker>
29
+ </div>
30
+ <div class="col-sm-2 form-group">
31
+ <label class="font_normal_body">客户编号</label>
32
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
33
+ condition="f_userinfo_code = '{}' " placeholder="客户编号">
34
+ </div>
35
+ <div class="col-sm-2 form-group">
36
+ <label class="font_normal_body">客户名称</label>
37
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
38
+ condition="f_user_name = '{}'" placeholder="客户名称">
39
+ </div>
40
+ <div class="span" style="float:right;">
41
+ <button class="button_search button_spacing" @click="search()">查询</button>
42
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
43
+
44
+ <export-excel :data="$parent.$parent.getCondition"
45
+ :field="$parent.$parent.getfield"
46
+ :footer="$parent.$parent.footer"
47
+ :header="$parent.$parent.other"
48
+ sqlurl="rs/logic/saleExport"
49
+ sql-name="salearrearsQuery"
50
+ template-name='用户欠费查询导出'
51
+ :choose-col="true"></export-excel>
52
+
53
+ <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
54
+ :defaultfield="$parent.$parent.defaultfield"
55
+ titletable="用户欠费查询导出"
56
+ :sumsmodel="$parent.$parent.sumsmodel"></print-data>
57
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
58
+ 'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
59
+
60
+ </div>
61
+ </div>
62
+
63
+ <div class="row" v-show="$parent.$parent.criteriaShow">
64
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
65
+
66
+
67
+ <div class="col-sm-2 form-group">
68
+
69
+ <label for="inputstartDate" class="font_normal_body">抄表日期</label>
70
+ <datepicker id="inputstartDate" placeholder="开始日期" style="width:60%"
71
+ v-model="model.inputstartDate"
72
+ :value.sync="model.inputstartDate"
73
+ :format="'yyyy-MM-dd 00:00:00'"
74
+ :show-reset-button="true"
75
+ >
76
+ </datepicker>
77
+ </div>
78
+ <div class="col-sm-2 form-group">
79
+ <label for="inputendDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
80
+ <datepicker id="inputendDate" placeholder="结束日期" style="width:60%"
81
+ v-model="model.inputendDate"
82
+ :value.sync="model.inputendDate"
83
+ :format="'yyyy-MM-dd 23:59:59'"
84
+ :show-reset-button="true"
85
+ >
86
+ </datepicker>
87
+ </div>
88
+
89
+
90
+ <!--<div class="col-sm-2 form-group">-->
91
+ <!--<label class="font_normal_body">收费编号</label>-->
92
+ <!--<input type="text" style="width:60%" class="input_search" v-model="model.id"-->
93
+ <!--condition="id = '{}'" placeholder="收费编号">-->
94
+ <!--</div>-->
95
+ <div class="col-sm-2 form-group">
96
+ <label class="font_normal_body">客户电话</label>
97
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
98
+ condition="f_user_phone like '%{}%'" placeholder="客户电话">
99
+ </div>
100
+ <!--<div class="col-sm-2 form-group">-->
101
+ <!--<label class="font_normal_body">身份证号</label>-->
102
+ <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"-->
103
+ <!--condition="f_idnumber like '%{}%'" placeholder="身份证号">-->
104
+ <!--</div>-->
105
+ <div class="col-sm-2 form-group">
106
+ <label class="font_normal_body">客户地址</label>
107
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
108
+ condition="f_address like '%{}%'" placeholder='客户地址'>
109
+ </div>
110
+ <div class="col-sm-2 form-group">
111
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
112
+ <v-select :value.sync="model.f_residential_area"
113
+ class="select_list select"
114
+ enter-push
115
+ multiple
116
+ condition="f_residential_area in {}"
117
+ v-model="model.f_residential_area"
118
+ style="width: 60%"
119
+ :options='$parent.$parent.residentialArea' placeholder='选择小区'
120
+ close-on-select>
121
+
122
+ </v-select>
123
+ </div>
124
+ <div class="col-sm-2 form-group">
125
+ <label class="font_normal_body" >缴费类型</label>
126
+ <v-select :value.sync="model.f_payment" multiple
127
+ v-model="model.f_payment"
128
+ :options='$parent.$parent.dypayment' placeholder='请选择'
129
+ condition="f_cost_type in {}"
130
+ close-on-select></v-select>
131
+ </div>
132
+ <!--<div class="col-sm-2 form-group">-->
133
+ <!--<label class="font_normal_body" title="参数:付款方式查询">付款方式</label>-->
134
+ <!--<v-select :value.sync="model.f_payment" multiple-->
135
+ <!--v-model="model.f_payment"-->
136
+ <!--:options='$parent.$parent.payment' placeholder='请选择'-->
137
+ <!--condition="f_payment in {}"-->
138
+ <!--close-on-select></v-select>-->
139
+ <!--</div>-->
140
+ <!--<div class="col-sm-2 form-group">-->
141
+ <!--<label class="font_normal_body">收费类型</label>-->
142
+ <!--&lt;!&ndash; <v-select :value.sync="model.f_type"-->
143
+ <!--v-model="model.f_type"-->
144
+ <!--:options='$parent.$parent.chargetype' placeholder='请选择'-->
145
+ <!--condition="f_type = '{}'"-->
146
+ <!--close-on-select></v-select>&ndash;&gt;-->
147
+ <!--<v-select :value.sync="model.f_type" multiple-->
148
+ <!--:options='$parent.$parent.chargetype' placeholder='请选择'-->
149
+ <!--close-on-select clear-button-->
150
+ <!--condition="f_type in {}"-->
151
+ <!--v-model="model.f_type"></v-select>-->
152
+ <!--</div>-->
153
+ <div class="col-sm-2 form-group">
154
+ <label class="font_normal_body">客户类型</label>
155
+ <v-select :value.sync="model.f_user_type"
156
+ @change="$parent.$parent.userTypeChange()"
157
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
158
+ condition="f_user_type = '{}'"
159
+ close-on-select></v-select>
160
+ </div>
161
+ <div class="col-sm-2 form-group">
162
+ <label class="font_normal_body">用气性质</label>
163
+ <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
164
+ :options='$parent.$parent.gasproperties' placeholder='请选择'
165
+ condition="f_gasproperties = '{}'"
166
+ close-on-select></v-select>
167
+ </div>
168
+ <div class="col-sm-2 form-group">
169
+ <label class="font_normal_body" title="欠费气量大于">欠费气量</label>
170
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtamount"
171
+ condition="f_oughtamount > '{}'" placeholder="欠费气量大于">
172
+ </div>
173
+ <div class="col-sm-2 form-group">
174
+ <label class="font_normal_body" title="气费金额大于">气费金额</label>
175
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_new"
176
+ condition="f_oughtfee_new > '{}'" placeholder="气费金额大于">
177
+ </div>
178
+ <div class="col-sm-2 form-group">
179
+ <label class="font_normal_body">欠费金额</label>
180
+ <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtfee_col_small"
181
+ condition="f_oughtfee_col >= '{}' " placeholder="大于等于">
182
+ <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtfee_col_big"
183
+ condition="f_oughtfee_col <= '{}' " placeholder="小于等于">
184
+ </div>
185
+ <div class="col-sm-2 form-group">
186
+ <label class="font_normal_body">欠费期数</label>
187
+ <input type="text" style="width:60%" class="input_search" v-model="model.c"
188
+ condition="c > '{}'" placeholder='欠费期数大于'>
189
+ </div>
190
+ <div class="col-sm-2 form-group">
191
+ <label class="font_normal_body">抄&ensp;表&ensp;员</label>
192
+ <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
193
+ style="width:60%"
194
+ multiple="true"
195
+ :options='$parent.$parent.inputtores' placeholder='抄表员'
196
+ condition="f_inputtor = '{}'"
197
+ close-on-select
198
+ v-el:cc></v-select>
199
+ </div>
200
+ <div class="col-sm-2 form-group">
201
+ <label class="font_normal_body">抄&ensp;表&ensp;册</label>
202
+ <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
203
+ :options='$parent.$parent.meterbooks' placeholder='抄表册'
204
+ style="width:60%"
205
+ close-on-select
206
+ condition="f_meter_book_num = '{}'"></v-select>
207
+ </div>
208
+ <div class="col-sm-2 form-group">
209
+ <label class="font_normal_body" >档案抄表员</label>
210
+ <v-select :value.sync="model.f_dainputtores"
211
+ v-model="model.f_dainputtores"
212
+ :options='$parent.$parent.dainputtores' placeholder='请选择'
213
+ condition="f_dainputtores = '{}'"
214
+ close-on-select>
215
+ </v-select>
216
+ </div>
217
+ <!--<div class="col-sm-2 form-group">-->
218
+ <!--<label class="font_normal_body">气价类型</label>-->
219
+ <!--<v-select :value.sync="model.pricetype" v-model="model.pricetype"-->
220
+ <!--placeholder='气价类型' :options="$parent.$parent.pricetypes"-->
221
+ <!--close-on-select v-ref:type>-->
222
+ <!--</v-select>-->
223
+ <!--</div>-->
224
+ <!--<div class="col-sm-2 form-group">-->
225
+ <!--<label class="font_normal_body">气价名称</label>-->
226
+ <!--<v-select :value.sync="model.f_price_name"-->
227
+ <!--v-model="model.f_price_name"-->
228
+ <!--:options="$parent.$parent.getPricenames"-->
229
+ <!--condition="f_price_name = '{}'"-->
230
+ <!--close-on-select></v-select>-->
231
+ <!--</div>-->
232
+ <!--<div class="col-sm-2 form-group">-->
233
+ <!--<label class="font_normal_body">&nbsp;&nbsp;&nbsp;表编号</label>-->
234
+ <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_user_id"-->
235
+ <!--condition="f_user_id = '{}'" placeholder='表编号'>-->
236
+ <!--</div>-->
237
+ </div>
238
+ </div>
239
+ </criteria>
240
+
241
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
242
+ <template partial='head'>
243
+ <tr>
244
+ <th>
245
+ <nobr>序号</nobr>
246
+ </th>
247
+ <th>
248
+ <nobr>客户编号</nobr>
249
+ </th>
250
+ <th>
251
+ <nobr>客户姓名</nobr>
252
+ </th>
253
+ <th>
254
+ <nobr>小区名称</nobr>
255
+ </th>
256
+ <th>
257
+ <nobr>地址</nobr>
258
+ </th>
259
+ <th>
260
+ <nobr>客户电话</nobr>
261
+ </th>
262
+ <th>
263
+ <nobr>备用电话</nobr>
264
+ </th>
265
+ <th>
266
+ <nobr>气表类型</nobr>
267
+ </th>
268
+
269
+ <th>
270
+ <nobr>欠费期数</nobr>
271
+ </th>
272
+ <th>
273
+ <nobr>欠费区间</nobr>
274
+ </th>
275
+ <th>
276
+ <nobr>上期抄表底数</nobr>
277
+ </th>
278
+ <th>
279
+ <nobr>本期抄表底数</nobr>
280
+ </th>
281
+ <th>
282
+ <nobr>用气量</nobr>
283
+ </th>
284
+ <th>
285
+ <nobr>用气金额</nobr>
286
+ </th>
287
+ <th>
288
+ <nobr>合计欠费</nobr>
289
+ </th>
290
+ <th>
291
+ <nobr>实际欠费</nobr>
292
+ </th>
293
+ <th>
294
+ <nobr>缴费时间</nobr>
295
+ </th>
296
+ <th>
297
+ <nobr>已交金额</nobr>
298
+ </th>
299
+ <!--<th>-->
300
+ <!--<nobr>回收率</nobr>-->
301
+ <!--</th>-->
302
+ <th>
303
+ <nobr>应交气费</nobr>
304
+ </th>
305
+ <th>
306
+ <nobr>滞纳金</nobr>
307
+ </th>
308
+ <th>
309
+ <nobr>附加费</nobr>
310
+ </th>
311
+ <th>
312
+ <nobr>上期余额</nobr>
313
+ </th>
314
+ <th>
315
+ <nobr>抄表员</nobr>
316
+ </th>
317
+ <th>
318
+ <nobr>抄表册</nobr>
319
+ </th>
320
+ <th>
321
+ <nobr>档案抄表员</nobr>
322
+ </th>
323
+ <th>
324
+ <nobr>客户类型</nobr>
325
+ </th>
326
+ <th>
327
+ <nobr>缴费类型</nobr>
328
+ </th>
329
+ <th>
330
+ <nobr>用气性质</nobr>
331
+ </th>
332
+ <th>
333
+ <nobr>备&nbsp;&nbsp;&nbsp;&nbsp;注</nobr>
334
+ </th>
335
+ </tr>
336
+ </template>
337
+ <template partial='body'>
338
+ <td style="text-align:center">
339
+ <nobr>{{$index+1}}</nobr>
340
+ </td>
341
+ <td style="text-align: center;">
342
+ <nobr>{{row.f_userinfo_code}}</nobr>
343
+ </td>
344
+ <td style="text-align: center;">
345
+ <nobr>{{row.f_user_name}}</nobr>
346
+ </td>
347
+ <td style="text-align: center;">
348
+ <nobr>{{row.f_residential_area}}</nobr>
349
+ </td>
350
+ <td style="text-align: center;">
351
+ <nobr>{{row.f_address}}</nobr>
352
+ </td>
353
+ <td style="text-align: center;">
354
+ <nobr>{{row.f_user_phone}}</nobr>
355
+ </td>
356
+ <td style="text-align: center;">
357
+ <nobr>{{row.f_rent_phone}}</nobr>
358
+ </td>
359
+ <td style="text-align: center;">
360
+ <nobr>{{row.f_meter_classify}}</nobr>
361
+ </td>
362
+
363
+ <td style="text-align: center;">
364
+ <nobr>{{row.c}}</nobr>
365
+ </td>
366
+ <td style="text-align: center;">
367
+ <nobr>{{row.f_hand_date}}</nobr>
368
+ </td>
369
+ <td style="text-align: center;">
370
+ <nobr>{{row.f_last_tablebase}}</nobr>
371
+ </td>
372
+ <td style="text-align: center;">
373
+ <nobr>{{row.f_tablebase}}</nobr>
374
+ </td>
375
+ <td style="text-align: center;">
376
+ <nobr>{{row.f_oughtamount}}</nobr>
377
+ </td>
378
+ <td style="text-align: center;">
379
+ <nobr>{{row.f_oughtfee}}</nobr>
380
+ </td>
381
+ <td style="text-align: center;">
382
+ <nobr>{{row.f_oughtfee_all}}</nobr>
383
+ </td>
384
+ <td style="text-align: center;">
385
+ <nobr>{{row.f_oughtfee_col}}</nobr>
386
+ </td>
387
+ <td style="text-align: center;">
388
+ <nobr>{{row.f_operate_date}}</nobr>
389
+ </td>
390
+ <td style="text-align: center;">
391
+ <nobr>{{row.f_debt_money}}</nobr>
392
+ </td>
393
+ <!--<td style="text-align: center;">-->
394
+ <!--<nobr>{{row.f_hand_bv}}</nobr>-->
395
+ <!--</td>-->
396
+ <td style="text-align: center;">
397
+ <nobr>{{row.f_oughtfee_new}}</nobr>
398
+ </td>
399
+ <td style="text-align: center;">
400
+ <nobr>{{row.overdue}}</nobr>
401
+ </td>
402
+ <td style="text-align: center;">
403
+ <nobr>{{row.f_garbage_fee}}</nobr>
404
+ </td>
405
+ <td style="text-align: center;">
406
+ <nobr>{{row.f_balance}}</nobr>
407
+ </td>
408
+ <td style="text-align: center;">
409
+ <nobr>{{row.f_inputtor}}</nobr>
410
+ </td>
411
+ <td style="text-align: center;">
412
+ <nobr>{{row.f_book_name}}</nobr>
413
+ </td>
414
+ <td style="text-align: center;">
415
+ <nobr>{{row.f_dainputtores}}</nobr>
416
+ </td>
417
+ <td style="text-align: center;">
418
+ <nobr>{{row.f_user_type}}</nobr>
419
+ </td>
420
+ <td style="text-align: center;">
421
+ <nobr>{{row.f_gasproperties}}</nobr>
422
+ </td>
423
+ <td style="text-align: center;">
424
+ <nobr>{{row.f_cost_type}}</nobr>
425
+ </td>
426
+ <td style="text-align: center;">
427
+ <nobr>{{row.f_comments}}</nobr>
428
+ </td>
429
+ </template>
430
+ <template partial='foot'></template>
431
+ </data-grid>
432
+ </criteria-paged>
433
+ <table class="table-hover">
434
+ <tr style="position: relative" class="table-bordered">
435
+ <td
436
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
437
+ 汇总信息
438
+ </td>
439
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
440
+ 用气量合计:&emsp;{{sumsmodel.f_oughtamount}}
441
+ </td>
442
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
443
+ 用气金额合计:&emsp;{{sumsmodel.f_oughtfee}}
444
+ </td>
445
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
446
+ 已交金额合计:&emsp;{{sumsmodel.f_debt_money}}
447
+ </td>
448
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
449
+ 气费金额合计:&emsp;{{sumsmodel.f_oughtfee_new}}
450
+ </td>
451
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
452
+ 滞纳金合计:&emsp;{{sumsmodel.overdue}}
453
+ </td>
454
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
455
+ 附加费合计:&emsp;{{sumsmodel.f_garbage_fee}}
456
+ </td>
457
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
458
+ 上期余额合计:&emsp;{{sumsmodel.f_balance}}
459
+ </td>
460
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
461
+ 合计欠费:&emsp;{{sumsmodel.f_oughtfee_all}}
462
+ </td>
463
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
464
+ 实际欠费:&emsp;{{sumsmodel.f_oughtfee_col}}
465
+ </td>
466
+ </tr>
467
+ </table>
468
+ </div>
469
+ <div v-if="show">
470
+ <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
471
+ </div>
472
+ </div>
473
+ </div>
474
+ </template>
475
+
476
+ <script>
477
+ import {HttpResetClass, PagedList} from 'vue-client'
478
+
479
+ let readySomething = async function (self) {
480
+
481
+ self.getinputtores();
482
+ //加载抄表册
483
+ self.initmeterbook();
484
+ self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
485
+ self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
486
+ // self.$refs.paged.$refs.cri.search()
487
+ self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
488
+ await self.$LoadParams.loadParam()
489
+ self.initParams()
490
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
491
+ }
492
+ export default {
493
+ title: '欠费查询',
494
+ data() {
495
+ return {
496
+ config: {
497
+ defaultPrint: ['f_userinfo_code', 'f_address']
498
+ },
499
+ other:[],
500
+ footer:[],
501
+ //f_price_name:[],
502
+ gasproperties:[],
503
+ showinfo: false,
504
+ data: {},
505
+ show:false,
506
+ rowdata:{},
507
+ initres: {
508
+ org:[this.$login.f.orgid],
509
+ dep:[],
510
+ user:[]
511
+ },
512
+ model: new PagedList('rs/sql/salearrearsQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
513
+ f_oughtamount: 0,
514
+ f_oughtfee: 0,
515
+ f_debt_money: 0,
516
+ f_oughtfee_new: 0,
517
+ overdue: 0,
518
+ f_garbage_fee: 0,
519
+ f_balance:0,
520
+ f_oughtfee_all: 0,
521
+ f_oughtfee_col: 0
522
+ }),
523
+ criteriaShow: false,
524
+ orgCondtionStr: '',
525
+ // 下拉框
526
+ meterbrands: [],
527
+ pricenames: [],
528
+ prices: [],
529
+ area: [],
530
+ //合计数据
531
+ defaultfield: [],
532
+ //小区
533
+ residentialArea: [],
534
+ sumsmodel: {},
535
+ f_filialeid: this.$login.f.f_orgid,
536
+ meterbooks:[{label: '全部',value: ''}], //抄表册
537
+ // inputtores:[{label: '全部',value: ''}],
538
+ dainputtores:[{label: '全部',value: ''}],
539
+ allorgid:[],
540
+ tempfalg :false,
541
+ lastorgstr:'',
542
+ dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
543
+ }
544
+ },
545
+ ready() {
546
+ this.hqdainputtores()
547
+ this.getaddress()
548
+ readySomething(this).then(() => {
549
+ this.$emit('ready')
550
+ }).catch((error) => {
551
+ this.$emit('error', error)
552
+ })
553
+ },
554
+ methods: {
555
+
556
+ async hqdainputtores() {
557
+ let param = {
558
+ items: 'DISTINCT f_inputtor',
559
+ tablename: 't_userfiles',
560
+ condition: ` f_inputtor is NOT null`,
561
+ }
562
+ let getDainputtores = await new HttpResetClass().load("POST",'rs/sql/singleTableParam', {data: param}, {
563
+ resolveMsg: null,
564
+ rejectMsg: null
565
+ });
566
+ if (getDainputtores.data.length > 0) {
567
+ let rs = [];
568
+ getDainputtores.data.forEach((item) => {
569
+ if (item.f_inputtor.length > 0) {
570
+ let temp = {
571
+ label: item.f_inputtor,
572
+ value: item.f_inputtor
573
+ };
574
+ rs.push(temp);
575
+ }
576
+ })
577
+ this.dainputtores = [{label: '全部', value: ''}, ...rs];
578
+ } else {
579
+ this.dainputtores = [{label: '全部', value: ''}];
580
+ }
581
+ },
582
+ async inputtorchange(){
583
+ let val = this.$refs.paged.$refs.cri.model.f_inputtor;
584
+ if(val!=null && val !=""){
585
+ let param={
586
+ items:'*',
587
+ tablename:'t_meter_book',
588
+ condition:` 1=1 and f_inputtor = '${val}' and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `,
589
+ orderitem:'id'
590
+
591
+ }
592
+ let getMeterBooks = await this.$resetpost('rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错!!!'})
593
+ if (getMeterBooks.data) {
594
+ if(getMeterBooks.data.length >0){
595
+ let rs = [];
596
+ getMeterBooks.data.forEach((item)=>{
597
+ let temp = {
598
+ label:item.f_book_name,
599
+ value:item.id
600
+ };
601
+ rs.push(temp);
602
+
603
+ })
604
+ this.meterbooks = [{label: '全部',value: ''}, ...rs];
605
+ this.$set('$refs.paged.$refs.cri.model.f_meter_book',[getMeterBooks.data[0].id]);
606
+ }else{
607
+ this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
608
+ this.meterbooks = [{label: '全部',value: ''}];
609
+ }
610
+ }
611
+ }else{
612
+ this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
613
+ this.meterbooks = [{label: '全部',value: ''}];
614
+ this.initmeterbook();
615
+ }
616
+ },
617
+ async initmeterbook(orgstr){
618
+ if(orgstr == null ){
619
+ orgstr = this.f_filialeid;
620
+ }
621
+ //获取新的抄表册,先去清理所有的抄表册
622
+ this.$GetSaleParam.meterbooks = [];
623
+ //开始加载新的抄表册
624
+ await this.$LoadParams.loadMeterBook(orgstr)
625
+ this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
626
+ },
627
+ getinputtores () {
628
+ // 获取抄表员
629
+ let rs = []
630
+ if (this.$login.f.f_gasman.length > 0) {
631
+ for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
632
+ let temp = {
633
+ label: this.$login.f.f_gasman[i].name,
634
+ value: this.$login.f.f_gasman[i].name
635
+ }
636
+ rs.push(temp)
637
+ }
638
+ }
639
+ return [{label: '全部', value: ''}, ...rs]
640
+ },
641
+ //加载抄表册
642
+ loadMeterBooks(){
643
+ this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
644
+ },
645
+ getotherfooter(){
646
+ // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
647
+ // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
648
+ this.other=[];
649
+ this.footer=[];
650
+ let exportdata = this.getCondition;
651
+ let otherInData=[];
652
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
653
+ let footerData=[],exportfield=this.getfield;
654
+ footerData.push("合计");
655
+ let self =this;
656
+ for(var field in self.sumsmodel){
657
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
658
+ }
659
+ this.footer.push(footerData);
660
+ this.other.push(otherInData);
661
+ },
662
+ async getaddress(){
663
+ console.log('开始获取小区')
664
+ let HttpReset = new HttpResetClass()
665
+ var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
666
+ data: {
667
+ condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
668
+ }
669
+ }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
670
+ console.log('小区',data)
671
+ let house = [{label: '全部', value: ''}]
672
+ for (let row of data.data){
673
+ console.log('开始保存小区')
674
+ house.push({label: row.f_residential_area, value: row.f_residential_area})
675
+ }
676
+ this.residentialArea = house
677
+ },
678
+ //把数据库查询数据转换为下拉数据
679
+ calculate(rows){
680
+ let data = []
681
+ rows.forEach((row, n) => {
682
+ data[n] = {label: row.f_residential_area, value: row.id}
683
+ })
684
+ return data
685
+ },
686
+
687
+ search(){
688
+ this.$refs.paged.$refs.cri.search()
689
+ },
690
+ cancel() {
691
+ this.show = false
692
+ },
693
+ showmsg(obj){
694
+ this.rowdata=obj
695
+ this.show=true
696
+ },
697
+ userTypeChange () {
698
+ this.gasproperties=[]
699
+ if(this.$refs.paged.$refs.cri.model !==null) {
700
+ this.$refs.paged.$refs.cri.model.f_gasproperties=''
701
+
702
+ console.log("查看客户类型是什么",this.$refs.paged.$refs.cri.model.f_user_type[0])
703
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
704
+ // this.gasproperties.push({label: '全部', value: ''})
705
+ }
706
+ else{
707
+ this.gasproperties =[{label: '全部', value: ''}]
708
+ }
709
+ },
710
+ initParams() {
711
+ // 初始化气表品牌
712
+ let brandArr = []
713
+ this.$GetSaleParam.getGasbrand().forEach((item) => {
714
+ let temp = {}
715
+ temp.label = item.label
716
+ temp.value = item.value.id
717
+ brandArr.push(temp)
718
+ // // 取出对应气表型号
719
+ // let styleArr = []
720
+ // for (let row of item.value.gasmodel) {
721
+ // styleArr.push({label: row.label, value: row.value.id})
722
+ // }
723
+ // this.meterstyle[temp.value] = styleArr
724
+ })
725
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
726
+ //初始化气表价格
727
+ this.prices = this.$GetSaleParam.getPrice(this.$login.f.orgid)
728
+ },
729
+ selfSearch(args) {
730
+ console.log('开始时间',this.$refs.paged.$refs.cri.model.startDate)
731
+ if (this.$refs.paged.$refs.cri.model.startDate === '' || this.$refs.paged.$refs.cri.model.endDate === ''){
732
+ this.$showAlert('请先选择开始时间、结束时间,再进行查询操作!', 'warning', 3000)
733
+ } else {
734
+ //小区查询条件
735
+ let f_orgstr = this.orgCondtionStr
736
+ let str='1=1 '
737
+ if(this.$refs.paged.$refs.cri.model.inputstartDate !== ''){
738
+ str += `and f_input_date>='${this.$refs.paged.$refs.cri.model.inputstartDate}'`
739
+ }
740
+ if(this.$refs.paged.$refs.cri.model.inputendDate !== ''){
741
+ str += `and f_input_date<='${this.$refs.paged.$refs.cri.model.inputendDate}'`
742
+ }
743
+ args.condition = `${args.condition} and f_meter_type='机表'` + f_orgstr
744
+ this.model.search(args.condition, args.model,str)
745
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
746
+ }
747
+ },
748
+ clear() {
749
+ //清空部门和人员
750
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
751
+ //部门和人员变为全选
752
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
753
+ this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
754
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
755
+ this.$refs.paged.$refs.cri.model[key] = []
756
+ })
757
+
758
+ },
759
+ dealmsg(val) {
760
+ val.model = this.model.model
761
+ this.$dispatch('deal-msg', val)
762
+ },
763
+ show() {
764
+ this.criteriaShow = true
765
+ },
766
+ hidden() {
767
+ this.criteriaShow = !this.criteriaShow
768
+ },
769
+ async getRes(condition,obj) {
770
+ this.orgCondtionStr = condition
771
+ this.orgname = obj.orgnames[0]
772
+ this.depname = obj.depnames[0]
773
+
774
+ },
775
+ async updateParams() {
776
+ await this.$LoadParams.loadParam(this.f_filialeid)
777
+ this.inputtores = [];
778
+ this.inputtores.push({label: "全部", value: ""})
779
+ if(this.allorgid!=null){
780
+ this.allorgid.forEach((res)=>{
781
+ this.inputtores = this.inputtores.concat(this.$GetSaleParam.getresinputtor(res));
782
+ })
783
+ }
784
+ this.initParams()
785
+ },
786
+ },
787
+ events:{
788
+ 'getidcard'(IdCard){
789
+ this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
790
+ }
791
+ },
792
+ watch: {
793
+ 'model'(val) {
794
+ },
795
+ // async 'orgCondtionStr'(val) {
796
+ // this.$refs.paged.$refs.cri.model.f_book_slice_area=[]
797
+ // this.$refs.paged.$refs.cri.model.f_meter_book = []
798
+ // this.meterbooks = [{label: '全部',value: ''}];
799
+ // if(this.lastorgstr != val){
800
+ // this.tempfalg = true;
801
+ // this.lastorgstr = val;
802
+ // }
803
+ // if(this.tempfalg && val != null && val!='' && val.indexOf("(")>-1){
804
+ // this.tempfalg = false;
805
+ // let a = val.substring(val.indexOf("(")+2)
806
+ // await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
807
+ // }
808
+ // let res = val.match(/'(.*?)'/)
809
+ // if (res) {
810
+ // this.f_filialeid = res[1]
811
+ // if(res.input !=null){
812
+ // let resorgid = res.input.substring(res.input.indexOf("'"));
813
+ // if(resorgid!= null && resorgid!=''){
814
+ // resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
815
+ // // resorgid = resorgid.replaceAll("'","");
816
+ // resorgid = resorgid.replace(/'/g,"");
817
+ // this.allorgid = resorgid.split(",")
818
+ // }
819
+ // }
820
+ // this.updateParams()
821
+ // }
822
+ // },
823
+ sumsmodel:{
824
+ handler: function(val) {
825
+ this.getotherfooter();
826
+ },
827
+ deep: true
828
+ }
829
+ },
830
+ computed: {
831
+ pricetypes() {
832
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
833
+ },
834
+ inputtores () {
835
+ // 获取抄表员
836
+ console.log('获取抄表员', this.$login.f)
837
+ let rs = []
838
+ if (this.$login.f.f_gasman.length > 0) {
839
+ for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
840
+ let temp = {
841
+ label: this.$login.f.f_gasman[i].name,
842
+ value: this.$login.f.f_gasman[i].name
843
+ }
844
+ rs.push(temp)
845
+ }
846
+ }
847
+ return [...rs]
848
+ },
849
+ getPricenames () {
850
+ let f_filialeid = this.f_filialeid
851
+ let result = []
852
+ this.$GetSaleParam.prices.forEach((item) => {
853
+ if (item.f_state === '有效' && f_filialeid == item.f_filialeid) {
854
+ let value = {
855
+ label: item.f_price_name,
856
+ value: item
857
+ }
858
+ result.push(value)
859
+ }
860
+ })
861
+ return Array.from(new Set(result))
862
+ },
863
+ getCondition() {
864
+ return {
865
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
866
+ endDate: this.$refs.paged.$refs.cri.model.endDate,
867
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
868
+ condValue: `${this.model.condValue}`
869
+ }
870
+ },
871
+ getfield() {
872
+ return {
873
+ 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_residential_area': '小区名称', 'f_address': '客户地址',
874
+ 'f_user_phone': '客户电话','f_rent_phone': '备用电话','f_inputtor': '抄表员','f_book_name': '抄表册','f_user_type': '客户类型',
875
+ 'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
876
+ 'f_oughtfee': '用气金额','f_operate_date': '缴费时间', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
877
+ 'overdue': '滞纳金', 'f_garbage_fee': '附加费','f_last_tablebase': '上期抄表底数','f_tablebase': '本期抄表底数','f_balance': '上期余额',
878
+ 'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额','f_cost_type':'缴费方式'
879
+ }
880
+ },
881
+ usertypes() {
882
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
883
+ },
884
+ metertypes() {
885
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
886
+ },
887
+ chargetype() {
888
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
889
+ }
890
+ }
891
+ }
892
+ </script>
@@ -22,4 +22,6 @@ export default function () {
22
22
  Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
23
23
  // 当前选择用户的表具基本信息
24
24
  Vue.component('user-meterinfodetail', (resolve) => { require(['./leftview/meterinfodetail'], resolve) })
25
+ // 欠费查询
26
+ Vue.component('sale-arrears-query', (resolve) => { require(['./machineHandManage/ArrearsQuery'], resolve) })
25
27
  }
@@ -353,7 +353,7 @@
353
353
  import * as Util from '../../../../Util'
354
354
 
355
355
  let readyGen = async function (self) {
356
- self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
356
+ self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
357
357
  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
358
358
  await self.$LoadParams.loadMeterBook(self.f_filialeid)
359
359
  self.loadMeterBooks()
@@ -374,17 +374,17 @@
374
374
  user: []
375
375
  },
376
376
  show: false,
377
- config:{
378
- examine: false,
377
+ config: {
378
+ examine: false
379
379
  },
380
380
  imgfilename: '',
381
381
  // 小区
382
382
  residentialArea: [],
383
383
  imgshow: false,
384
- criteriaShow:false,
384
+ criteriaShow: false,
385
385
  orgCondtionStr: '',
386
386
  excelCondition: '',
387
- condition:'',
387
+ condition: '',
388
388
  fields: {
389
389
  'f_userinfo_code': '客户编号',
390
390
  'f_user_name': '客户名称',
@@ -405,8 +405,8 @@
405
405
  'f_adjustable_name': '调压箱名称',
406
406
  'f_inputtor': '抄表员'
407
407
  },
408
- auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
409
- auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
408
+ auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
409
+ auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
410
410
  meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
411
411
  resultstate: this.$appdata.getParam('抄表结果状态'),
412
412
  meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -436,7 +436,7 @@
436
436
  methods: {
437
437
  // 修正本期底数
438
438
  amend (row) {
439
- let tablebase = window.prompt('请输入你要修正的底数值,上期底数:'+ row.f_meter_base)
439
+ let tablebase = window.prompt('请输入你要修正的底数值,上期底数:' + row.f_meter_base)
440
440
  if (!tablebase) return
441
441
  if (tablebase < 0) {
442
442
  this.$showAlert(`底数不能小于0,请注意!`, 'warning', 2000)
@@ -477,15 +477,15 @@
477
477
  })
478
478
  },
479
479
  async allsuccess () {
480
- console.log("条件:",this.condition)
480
+ console.log('条件:', this.condition)
481
481
  let res = await this.$showMessage('确定通过全部抄表吗?操作后将不可取消', ['confirm', 'cancel'])
482
482
  let con = []
483
483
  if (res === 'confirm') {
484
484
  let rowdata = this.$refs.paged.$refs.grid.getRowData()
485
485
  let length = rowdata.length
486
- let condition = rowdata.length == 0? this.condition : '1=1'
486
+ let condition = rowdata.length == 0 ? this.condition : '1=1'
487
487
  if (1) {
488
- if(rowdata.length > 0){
488
+ if (rowdata.length > 0) {
489
489
  for (let i = 0; i < rowdata.length; i++) {
490
490
  let temp = {
491
491
  f_hand_id: rowdata[i].id,
@@ -508,38 +508,40 @@
508
508
  let jobParam = {
509
509
  f_operatorid: this.$login.f.id,
510
510
  total: length,
511
- operator: this.$login.f.orgs +":"+ this.$login.f.deps +":"+ Vue.$login.f.name,
512
- jobType: "抄表审核"
511
+ operator: this.$login.f.orgs + ':' + this.$login.f.deps + ':' + Vue.$login.f.name,
512
+ jobType: '抄表审核'
513
513
  }
514
514
  let param = {
515
515
  batchParam: data,
516
516
  jobParam: jobParam
517
517
  }
518
- if (length > 0){
518
+ if (length > 0) {
519
519
  let confirm = await this.$showMessage(`您即将开始执行一个类型为【${jobParam.jobType}】的新任务,任务总量为${jobParam.total},是否执行?`, ['confirm', 'cancel'])
520
- if (confirm === 'confirm'){
520
+ if (confirm === 'confirm') {
521
521
  try {
522
522
  this.$showMessage(`【立即执行】批量执行${jobParam.jobType}任务添加成功,可在【我的任务】查看任务进度!`)
523
- let res =await this.$resetpost('rs/business/batchRun/handPlanAudit', {data:param}, {resolveMsg: '执行成功', rejectMsg: '执行失败'}, 1000*60*1)
523
+ let res = await this.$resetpost('rs/business/batchRun/handPlanAudit', {data: param}, {resolveMsg: '执行成功', rejectMsg: '执行失败'}, 1000 * 60 * 1)
524
524
  console.log('111111', res)
525
525
  this.$showMessage(`成功批量审核了${res.data.successnum}条数据`)
526
526
  } catch (e) {}
527
527
  }
528
- }else {
528
+ } else {
529
529
  let data = {
530
530
  condition: condition,
531
531
  f_audit_person: this.$login.f.name
532
532
  }
533
533
  let param = {
534
- sqlParam: data,
535
- jobParam: jobParam
534
+ sqlParam: data,
535
+ jobParam: jobParam,
536
+ isNowRun: true // 是否立即执行
536
537
  }
537
- let confirm = await this.$showMessage(`您即将开始执行一个类型为【${jobParam.jobType}】的新闲时执行任务,是否执行?`, ['confirm', 'cancel'])
538
- if(confirm === 'confirm'){
538
+ let confirm = await this.$showMessage(`您即将开始执行一个类型为【${jobParam.jobType}】的执行任务,是否执行?`, ['confirm', 'cancel'])
539
+ if (confirm === 'confirm') {
539
540
  try {
540
- this.$showMessage(`【闲时执行】批量执行${jobParam.jobType}任务添加成功,任务将在【0:00-5:00】闲时执行,可在【我的任务】查看任务进度!`)
541
- let res = await this.$resetpost('rs/business/batchRun/handPlanAudit/getAuditMachineHand', {data:param}, {resolveMsg: '执行成功', rejectMsg: '执行失败'}, 1000*60*1)
542
- this.$showMessage(`成功批量添加了${res.data.success}条数据,闲时执行!!`)
541
+ // this.$showMessage(`【闲时执行】批量执行${jobParam.jobType}任务添加成功,任务将在【0:00-5:00】闲时执行,可在【我的任务】查看任务进度!`)
542
+ this.$showMessage(`【立即执行】批量执行${jobParam.jobType}任务添加成功,可在【我的任务】查看任务进度!`)
543
+ let res = await this.$resetpost('rs/business/batchRun/handPlanAudit/getAuditMachineHandSimple', {data: param}, {resolveMsg: '执行成功', rejectMsg: '执行失败'}, 1000 * 60 * 1)
544
+ // this.$showMessage(`成功批量添加了${res.data.success}条数据,!!`)
543
545
  } catch (e) {}
544
546
  }
545
547
  }
@@ -581,9 +583,9 @@
581
583
  this.imgshow = false
582
584
  },
583
585
  imgShow (val) {
584
- console.log("-----------val2:",val)
586
+ console.log('-----------val2:', val)
585
587
  this.imgfilename = `rs/image/file/` + val
586
- console.log("-----------imgfilename2:",this.imgfilename)
588
+ console.log('-----------imgfilename2:', this.imgfilename)
587
589
  this.imgshow = true
588
590
  },
589
591
  async getaddress () {
@@ -612,11 +614,11 @@
612
614
  })
613
615
  },
614
616
  selfSearch (args) {
615
- if (!this.orgCondtionStr) {
616
- args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
617
- } else {
618
- args.condition = `${args.condition}` + this.orgCondtionStr
619
- }
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
+ // }
620
622
  this.excelCondition = args.condition
621
623
  this.condition = args.condition
622
624
  this.$refs.paged.$refs.grid.selectInit()
@@ -682,7 +684,7 @@
682
684
  },
683
685
  loadMeterBooks () {
684
686
  this.meterbooks = this.$GetSaleParam.getMeterBooks()
685
- },
687
+ }
686
688
 
687
689
  },
688
690
  computed: {
package/src/main.js CHANGED
@@ -4,7 +4,7 @@ import App from './App'
4
4
  import system from 'system-clients/src/system'
5
5
  import sale from './sale'
6
6
  // import wenxi from './filiale/rizhao/sale'
7
- import FilialeSale from './filiale/liaoyuan/sale'
7
+ import FilialeSale from './filiale/qianneng/sale'
8
8
  import address from 'address-client/src/address'
9
9
  import ldap from 'ldap-clients/src/ldap'
10
10
  import VueClipboard from 'vue-clipboard2'