sale-client 3.6.404 → 3.6.405
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/package.json +1 -1
- package/src/components/charge/business/IOTMeterCenter.vue +1 -1
- package/src/components/charge/business/NoCardMeterCenter.vue +1 -1
- package/src/components/common/searchuploadfile/uploadFilesHistory.vue +2 -2
- package/src/components/revenue/HandManager/MeterBookUser.vue +141 -139
- package/src/filiale/alashan/business/CardMeterCenter.vue +609 -609
- package/src/filiale/alashan/{CustQueryEticket.vue → eticket/CustQueryEticket.vue} +82 -25
- package/src/filiale/alashan/{EticketManage.vue → eticket/EticketManage.vue} +2 -11
- package/src/filiale/alashan/{EticketPrint.vue → eticket/EticketPrint.vue} +3 -3
- package/src/filiale/alashan/{EticketRecordList.vue → eticket/EticketRecordList.vue} +16 -37
- package/src/filiale/alashan/sale.js +7 -9
- package/src/filiale/wuhai/deductionManage.vue +25 -0
- package/src/filiale/wuhai/feeDeduction.vue +201 -0
- package/src/filiale/wuhai/sale.js +2 -0
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -428,7 +428,7 @@
|
|
|
428
428
|
self.hasLimit = getLimit.data.hasLimit
|
|
429
429
|
if (self.hasLimit) {
|
|
430
430
|
if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
|
|
431
|
-
if (getLimit.data.f_limit_value < 0
|
|
431
|
+
if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
|
|
432
432
|
self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
|
|
433
433
|
self.$dispatch('refresh')
|
|
434
434
|
} else {
|
|
@@ -297,7 +297,7 @@
|
|
|
297
297
|
self.hasLimit = getLimit.data.hasLimit
|
|
298
298
|
if (self.hasLimit) {
|
|
299
299
|
if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
|
|
300
|
-
if (getLimit.data.f_limit_value < 0
|
|
300
|
+
if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
|
|
301
301
|
self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
|
|
302
302
|
self.$dispatch('refresh')
|
|
303
303
|
} else {
|
|
@@ -154,9 +154,9 @@ export default {
|
|
|
154
154
|
let temp = res.data.array[j].f_downloadpath
|
|
155
155
|
let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
|
|
156
156
|
if (res.data.array[j].fusetype == '安检照片') {
|
|
157
|
-
res.data.array[j].f_downloadURL = location.protocol + location.host + '/rs/image/file/' + res.data.array[j].f_filename
|
|
157
|
+
res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
|
|
158
158
|
} else {
|
|
159
|
-
res.data.array[j].f_downloadURL = location.protocol + location.host + '/' + URL
|
|
159
|
+
res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/' + URL
|
|
160
160
|
}
|
|
161
161
|
console.log('res.data.array[j].f_downloadURL', res.data.array[j].f_downloadURL)
|
|
162
162
|
this.files[i].arrays.push(res.data.array[j])
|
|
@@ -9,21 +9,18 @@
|
|
|
9
9
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
10
10
|
condition="info.f_userinfo_code = '{}'" @keyup.enter="search()">
|
|
11
11
|
</div>
|
|
12
|
-
|
|
13
12
|
<div class="form-group col-sm-4 button-range" >
|
|
14
|
-
|
|
15
13
|
<button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
|
|
16
14
|
<button class="button_search" style="margin-right: 10px" @click="$parent.$parent.autoMeterBookSort()">表箱号排序</button>
|
|
17
15
|
<button class="button_search" style="margin-right: 10px" @click="$parent.$parent.saveSort()">保存当前顺序</button>
|
|
18
|
-
<button class="button_search" v-if="$parent.$parent.editsort==false" @click="$parent.$parent.editsort=true" v-el:cba>调整顺序</button>
|
|
19
|
-
<button class="button_search" v-if="$parent.$parent.editsort==true" @click="$parent.$parent.saveEditSort" v-el:cba>保存顺序</button>
|
|
16
|
+
<button class="button_search" v-if="$parent.$parent.editsort == false" @click="$parent.$parent.editsort=true" v-el:cba>调整顺序</button>
|
|
17
|
+
<button class="button_search" v-if="$parent.$parent.editsort == true" @click="$parent.$parent.saveEditSort" v-el:cba>保存顺序</button>
|
|
20
18
|
<export-excel
|
|
21
19
|
:data="{condition: $parent.$parent.condition,orderitem: $parent.$parent.orderitem}"
|
|
22
20
|
:field="$parent.$parent.getfield"
|
|
23
21
|
sqlurl="rs/logic/saleExport" sql-name="getMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
|
|
24
22
|
:choose-col="true"></export-excel>
|
|
25
23
|
<button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
|
|
26
|
-
|
|
27
24
|
<div
|
|
28
25
|
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
29
26
|
@click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
|
|
@@ -150,7 +147,8 @@
|
|
|
150
147
|
<data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
|
|
151
148
|
<template partial='head' >
|
|
152
149
|
<tr>
|
|
153
|
-
<th v-if="$parent.$parent.$parent.editsort"><nobr
|
|
150
|
+
<th v-if="$parent.$parent.$parent.editsort"><nobr>排序</nobr></th>
|
|
151
|
+
<th v-if="$parent.$parent.$parent.removebook"><nobr>移出</nobr></th>
|
|
154
152
|
<th><nobr>客户编号</nobr></th>
|
|
155
153
|
<th><nobr>客户名称</nobr></th>
|
|
156
154
|
<th>
|
|
@@ -181,7 +179,6 @@
|
|
|
181
179
|
<data-order field="f_room" name="房间号"
|
|
182
180
|
:order.sync="$parent.$parent.$parent.orderFields.f_room"></data-order>
|
|
183
181
|
</th>
|
|
184
|
-
|
|
185
182
|
<th><nobr>客户电话</nobr></th>
|
|
186
183
|
<th><nobr>表号</nobr></th>
|
|
187
184
|
<th>
|
|
@@ -201,10 +198,19 @@
|
|
|
201
198
|
</tr>
|
|
202
199
|
</template>
|
|
203
200
|
<template partial='body' >
|
|
204
|
-
<tr
|
|
205
|
-
<td style="text-align:center" v-if="$parent.$parent.$parent.editsort"
|
|
206
|
-
<
|
|
207
|
-
|
|
201
|
+
<tr>
|
|
202
|
+
<td style="text-align:center" v-if="$parent.$parent.$parent.editsort">
|
|
203
|
+
<nobr>
|
|
204
|
+
<span class="glyphicon glyphicon-arrow-up" @click="$parent.$parent.$parent.sortUp($index, row)" v-el:cba></span>
|
|
205
|
+
|
|
206
|
+
<span class="glyphicon glyphicon-arrow-down" @click="$parent.$parent.$parent.sortDown($index, row)" v-el:cba></span>
|
|
207
|
+
</nobr>
|
|
208
|
+
</td>
|
|
209
|
+
<td style="text-align:center" v-if="$parent.$parent.$parent.removebook">
|
|
210
|
+
<nobr>
|
|
211
|
+
<span title="移出表册" class="glyphicon glyphicon-paste" style="font-size: 20px" @click="$parent.$parent.$parent.delete($index, row)" v-el:cba></span>
|
|
212
|
+
<!-- <button class="btn btn-deltete width-10" @click="$parent.$parent.$parent.delete($index, row)"><a style="color: #e51a1abf"><b>移出表册</b></a></button>-->
|
|
213
|
+
</nobr>
|
|
208
214
|
</td>
|
|
209
215
|
<td style="text-align:center"><nobr><span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span></nobr></td>
|
|
210
216
|
<td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
|
|
@@ -291,19 +297,20 @@
|
|
|
291
297
|
title: '',
|
|
292
298
|
data () {
|
|
293
299
|
return {
|
|
294
|
-
model: new PagedList('rs/sql/getMeterBookUser', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "'
|
|
300
|
+
model: new PagedList('rs/sql/getMeterBookUser', 20, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_meter_book_sort asc'`}),
|
|
295
301
|
condition: '',
|
|
296
302
|
getfield: {},
|
|
297
303
|
show: false,
|
|
298
|
-
|
|
299
|
-
|
|
304
|
+
removebook: true,
|
|
305
|
+
row: null,
|
|
306
|
+
sortShow: false,
|
|
300
307
|
fileinfo: {
|
|
301
|
-
code:null,
|
|
302
|
-
meterbook:null,
|
|
303
|
-
booknum:null,
|
|
304
|
-
sort:null,
|
|
305
|
-
fileid:null,
|
|
306
|
-
infoid:null
|
|
308
|
+
code: null,
|
|
309
|
+
meterbook: null,
|
|
310
|
+
booknum: null,
|
|
311
|
+
sort: null,
|
|
312
|
+
fileid: null,
|
|
313
|
+
infoid: null
|
|
307
314
|
},
|
|
308
315
|
gasproperties: [],
|
|
309
316
|
f_filialeid: this.$login.f.orgid,
|
|
@@ -318,11 +325,11 @@
|
|
|
318
325
|
adjustables: [],
|
|
319
326
|
meterstyle: {},
|
|
320
327
|
criteriaShow: false,
|
|
321
|
-
editsort:false,
|
|
322
|
-
|
|
323
|
-
sortitem:'f_meter_book_sort',
|
|
324
|
-
rule:'asc',
|
|
325
|
-
orderitem:'f_meter_book_sort asc',
|
|
328
|
+
editsort: false,
|
|
329
|
+
// 排序
|
|
330
|
+
sortitem: 'f_meter_book_sort',
|
|
331
|
+
rule: 'asc',
|
|
332
|
+
orderitem: 'f_meter_book_sort asc',
|
|
326
333
|
orderFields: {
|
|
327
334
|
f_meter_book_sort: 'no'
|
|
328
335
|
},
|
|
@@ -348,7 +355,7 @@
|
|
|
348
355
|
}
|
|
349
356
|
}
|
|
350
357
|
},
|
|
351
|
-
props: ['f_meterbook_num','usercount'],
|
|
358
|
+
props: ['f_meterbook_num', 'usercount'],
|
|
352
359
|
async ready () {
|
|
353
360
|
readyGen(this)
|
|
354
361
|
},
|
|
@@ -365,38 +372,38 @@
|
|
|
365
372
|
// 如果新规则不排序，还原为默认排序
|
|
366
373
|
if (rule === 'no') {
|
|
367
374
|
this.model.paramSource.orderitem = `'f_meter_book_sort asc'`
|
|
368
|
-
this.rule= 'asc'
|
|
369
|
-
this.sortitem='f_meter_book_sort'
|
|
375
|
+
this.rule = 'asc'
|
|
376
|
+
this.sortitem = 'f_meter_book_sort'
|
|
370
377
|
} else {
|
|
371
378
|
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
372
379
|
this.orderitem = this.model.paramSource.orderitem
|
|
373
|
-
this.rule= rule
|
|
374
|
-
this.sortitem=field
|
|
380
|
+
this.rule = rule
|
|
381
|
+
this.sortitem = field
|
|
375
382
|
}
|
|
376
383
|
this.search()
|
|
377
384
|
},
|
|
378
|
-
async saveSort(){
|
|
385
|
+
async saveSort () {
|
|
379
386
|
if (!this.$login.r.find(value => value == '册内用户排序')) {
|
|
380
387
|
this.$showMessage('你没有【册内用户排序】的权限,请联系管理员!')
|
|
381
388
|
return
|
|
382
389
|
}
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
390
|
+
if (this.model.count < this.usercount) {
|
|
391
|
+
this.$showAlert('该功能适用于给表册内所有用户排序的情况，请去掉查询条件', 'warning', 3000)
|
|
392
|
+
} else {
|
|
393
|
+
this.$showMessage('此操作会将表册内用户按照现有查询结果的顺序排序，是否继续', ['confirm', 'cancel']).then((res) => {
|
|
394
|
+
if (res == 'confirm') {
|
|
395
|
+
this.$resetpost('rs/logic/changeBookSort',
|
|
396
|
+
{
|
|
397
|
+
data: {
|
|
398
|
+
f_meter_book_num: this.f_meterbook_num,
|
|
399
|
+
sortitem: this.sortitem,
|
|
400
|
+
rule: this.rule
|
|
401
|
+
}
|
|
402
|
+
}, {resolveMsg: '已成功修改册内排序！！', rejectMsg: '册内排序修改失败！！'})
|
|
403
|
+
this.search()
|
|
404
|
+
}
|
|
405
|
+
})
|
|
406
|
+
}
|
|
400
407
|
},
|
|
401
408
|
async autoMeterBookSort () {
|
|
402
409
|
if (!this.$login.r.find(value => value == '册内用户排序')) {
|
|
@@ -424,132 +431,132 @@
|
|
|
424
431
|
}
|
|
425
432
|
this.show = true
|
|
426
433
|
},
|
|
427
|
-
async sortEdit(position){
|
|
428
|
-
if(!this.fileinfo.code){
|
|
434
|
+
async sortEdit (position) {
|
|
435
|
+
if (!this.fileinfo.code) {
|
|
429
436
|
this.$showMessage('请输入目标用户编号')
|
|
430
437
|
return
|
|
431
438
|
}
|
|
432
439
|
// position:
|
|
433
440
|
// 0--将改用户的表册顺序排到目标用户前
|
|
434
441
|
// 1--将改用户的表册顺序排到目标用户后
|
|
435
|
-
if((!this.fileinfo.sort) ||(!this.fileinfo.booknum)
|
|
442
|
+
if ((!this.fileinfo.sort) || (!this.fileinfo.booknum)) {
|
|
436
443
|
this.$showMessage('目标用户无表册或在表册内无排序')
|
|
437
444
|
return
|
|
438
445
|
}
|
|
439
446
|
let http = new HttpResetClass()
|
|
440
|
-
await http.load('POST',
|
|
441
|
-
this.fileinfo= {
|
|
442
|
-
code:null,
|
|
443
|
-
fileid:null,
|
|
444
|
-
booknum:null,
|
|
445
|
-
meterbook:null,
|
|
446
|
-
infoid:null,
|
|
447
|
-
sort:null
|
|
447
|
+
await http.load('POST', 'rs/logic/sale_editBookSort', {data: {fileinfo: this.fileinfo, position: position, userfilesid: this.row.f_userfiles_id}}, {resolveMsg: '已成功将改表移到指定的表册位置', rejectMsg: '移动册内位置失败'})
|
|
448
|
+
this.fileinfo = {
|
|
449
|
+
code: null,
|
|
450
|
+
fileid: null,
|
|
451
|
+
booknum: null,
|
|
452
|
+
meterbook: null,
|
|
453
|
+
infoid: null,
|
|
454
|
+
sort: null
|
|
448
455
|
}
|
|
449
|
-
this.sortShow=false
|
|
456
|
+
this.sortShow = false
|
|
450
457
|
this.search()
|
|
451
458
|
},
|
|
452
|
-
async getBook(){
|
|
453
|
-
if(this.fileinfo.code){
|
|
459
|
+
async getBook () {
|
|
460
|
+
if (this.fileinfo.code) {
|
|
454
461
|
let http = new HttpResetClass()
|
|
455
462
|
let res = await http.load('POST', 'rs/sql/sale_getUserMeterBook', {
|
|
456
463
|
data: {
|
|
457
464
|
condition: `i.f_userinfo_code='${this.fileinfo.code}'`
|
|
458
465
|
}
|
|
459
466
|
}, {resolveMsg: null, rejectMsg: null})
|
|
460
|
-
console.log(
|
|
461
|
-
if(res.data.length===1){
|
|
462
|
-
if((!res.data[0].f_meter_book_sort
|
|
467
|
+
console.log('-------------------res:', res.data)
|
|
468
|
+
if (res.data.length === 1) {
|
|
469
|
+
if ((!res.data[0].f_meter_book_sort) || (!res.data[0].f_meter_book_num)) {
|
|
463
470
|
this.$showMessage('该用户不在表册内或在表册内无排序')
|
|
464
|
-
this.fileinfo= {
|
|
465
|
-
code:this.fileinfo.code,
|
|
466
|
-
fileid:null,
|
|
467
|
-
booknum:null,
|
|
468
|
-
meterbook:null,
|
|
469
|
-
infoid:null,
|
|
470
|
-
sort:null
|
|
471
|
+
this.fileinfo = {
|
|
472
|
+
code: this.fileinfo.code,
|
|
473
|
+
fileid: null,
|
|
474
|
+
booknum: null,
|
|
475
|
+
meterbook: null,
|
|
476
|
+
infoid: null,
|
|
477
|
+
sort: null
|
|
471
478
|
}
|
|
472
479
|
return
|
|
473
480
|
}
|
|
474
|
-
this.fileinfo.meterbook=res.data[0].f_book_name
|
|
475
|
-
this.fileinfo.sort=res.data[0].f_meter_book_sort
|
|
476
|
-
this.fileinfo.fileid=res.data[0].f_userfiles_id
|
|
477
|
-
this.fileinfo.infoid=res.data[0].f_userinfo_id
|
|
478
|
-
this.fileinfo.booknum=res.data[0].f_meter_book_num
|
|
479
|
-
}else{
|
|
481
|
+
this.fileinfo.meterbook = res.data[0].f_book_name
|
|
482
|
+
this.fileinfo.sort = res.data[0].f_meter_book_sort
|
|
483
|
+
this.fileinfo.fileid = res.data[0].f_userfiles_id
|
|
484
|
+
this.fileinfo.infoid = res.data[0].f_userinfo_id
|
|
485
|
+
this.fileinfo.booknum = res.data[0].f_meter_book_num
|
|
486
|
+
} else {
|
|
480
487
|
this.$showMessage('请核对输入的用户编号')
|
|
481
|
-
this.fileinfo= {
|
|
482
|
-
code:this.fileinfo.code,
|
|
483
|
-
fileid:null,
|
|
484
|
-
booknum:null,
|
|
485
|
-
meterbook:null,
|
|
486
|
-
infoid:null,
|
|
487
|
-
sort:null
|
|
488
|
+
this.fileinfo = {
|
|
489
|
+
code: this.fileinfo.code,
|
|
490
|
+
fileid: null,
|
|
491
|
+
booknum: null,
|
|
492
|
+
meterbook: null,
|
|
493
|
+
infoid: null,
|
|
494
|
+
sort: null
|
|
488
495
|
}
|
|
489
496
|
}
|
|
490
497
|
}
|
|
491
|
-
|
|
492
498
|
},
|
|
493
|
-
|
|
494
|
-
// console.log("-------------------------row",obj)
|
|
495
|
-
// this.row=obj
|
|
496
|
-
// this.sortShow=true
|
|
497
|
-
// },
|
|
498
|
-
async saveEditSort (){
|
|
499
|
+
async saveEditSort () {
|
|
499
500
|
for (let item of this.$refs.paged.$refs.grid.model.rows) {
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
501
|
+
let param = {
|
|
502
|
+
f_userfiles_id: item.f_userfiles_id,
|
|
503
|
+
version: item.fileversion,
|
|
504
|
+
f_meter_book_sort: item.f_meter_book_sort
|
|
505
|
+
}
|
|
506
|
+
let http = new HttpResetClass()
|
|
507
|
+
await http.load('POST', 'rs/entity/t_userfiles',
|
|
507
508
|
param,
|
|
508
|
-
{resolveMsg: null, rejectMsg:
|
|
509
|
+
{resolveMsg: null, rejectMsg: '保存失败'})
|
|
509
510
|
}
|
|
510
|
-
this.editsort=false
|
|
511
|
+
this.editsort = false
|
|
511
512
|
},
|
|
512
513
|
// 下移按钮
|
|
513
514
|
sortDown (index, row) {
|
|
514
515
|
if (index === (this.model.rows.length - 1)) {
|
|
515
516
|
this.$showAlert('已经是本页最后一个了', 'warning', 2000)
|
|
516
517
|
} else {
|
|
517
|
-
let rows=this.$refs.paged.$refs.grid.model.rows
|
|
518
|
-
this.$refs.paged.$refs.grid.model.rows=[]
|
|
518
|
+
let rows = this.$refs.paged.$refs.grid.model.rows
|
|
519
|
+
this.$refs.paged.$refs.grid.model.rows = []
|
|
519
520
|
let temp = rows[index + 1]
|
|
520
|
-
rows[index+1]=rows[index]
|
|
521
|
-
rows[index]=temp
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
rows[index
|
|
525
|
-
rows
|
|
526
|
-
|
|
527
|
-
this.$refs.paged.$refs.grid.model.rows=rows
|
|
528
|
-
|
|
521
|
+
rows[index + 1] = rows[index]
|
|
522
|
+
rows[index] = temp
|
|
523
|
+
let tempsort = rows[index + 1].f_meter_book_sort
|
|
524
|
+
rows[index + 1].f_meter_book_sort = rows[index].f_meter_book_sort
|
|
525
|
+
rows[index].f_meter_book_sort = tempsort
|
|
526
|
+
this.$refs.paged.$refs.grid.model.rows = rows
|
|
529
527
|
}
|
|
530
528
|
},
|
|
531
529
|
// 上移按钮
|
|
532
530
|
sortUp (index, row) {
|
|
533
|
-
|
|
534
531
|
if (index === 0) {
|
|
535
532
|
this.$showAlert('已经是本页第一个了', 'warning', 2000)
|
|
536
533
|
} else {
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
let rows=this.$refs.paged.$refs.grid.model.rows
|
|
540
|
-
|
|
541
|
-
this.$refs.paged.$refs.grid.model.rows=[]
|
|
534
|
+
let rows = this.$refs.paged.$refs.grid.model.rows
|
|
535
|
+
this.$refs.paged.$refs.grid.model.rows = []
|
|
542
536
|
let temp = rows[index - 1]
|
|
543
|
-
rows[index-1]=rows[index]
|
|
544
|
-
rows[index]=temp
|
|
545
|
-
console.log(
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
rows[index
|
|
549
|
-
rows
|
|
550
|
-
this.$refs.paged.$refs.grid.model.rows=rows
|
|
537
|
+
rows[index - 1] = rows[index]
|
|
538
|
+
rows[index] = temp
|
|
539
|
+
console.log('--------------this.$refs.paged.$refs.grid.model.rows,', rows)
|
|
540
|
+
let tempsort = rows[index - 1].f_meter_book_sort
|
|
541
|
+
rows[index - 1].f_meter_book_sort = rows[index].f_meter_book_sort
|
|
542
|
+
rows[index].f_meter_book_sort = tempsort
|
|
543
|
+
this.$refs.paged.$refs.grid.model.rows = rows
|
|
551
544
|
}
|
|
552
545
|
},
|
|
546
|
+
// 移出表册
|
|
547
|
+
async delete (index, row) {
|
|
548
|
+
let param = {
|
|
549
|
+
f_userfiles_id: row.f_userfiles_id,
|
|
550
|
+
version: row.fileversion,
|
|
551
|
+
f_meter_book_sort: '',
|
|
552
|
+
f_meter_book_num: ''
|
|
553
|
+
}
|
|
554
|
+
let http = new HttpResetClass()
|
|
555
|
+
await http.load('POST', 'rs/entity/t_userfiles',
|
|
556
|
+
param,
|
|
557
|
+
{resolveMsg: null, rejectMsg: '保存失败'})
|
|
558
|
+
this.$refs.paged.$refs.criteria.search()
|
|
559
|
+
},
|
|
553
560
|
close () {
|
|
554
561
|
this.show = false
|
|
555
562
|
this.newinfo = {
|
|
@@ -559,7 +566,6 @@
|
|
|
559
566
|
bookname: ''
|
|
560
567
|
}
|
|
561
568
|
},
|
|
562
|
-
|
|
563
569
|
userTypeChange () {
|
|
564
570
|
this.gasproperties = []
|
|
565
571
|
if (this.$refs.paged.$refs.criteria.model !== null) {
|
|
@@ -569,7 +575,6 @@
|
|
|
569
575
|
this.gasproperties = [{label: '全部', value: ''}]
|
|
570
576
|
}
|
|
571
577
|
},
|
|
572
|
-
|
|
573
578
|
async initParams () {
|
|
574
579
|
console.log('=================>加载', this.$GetSaleParam.getGasbrand())
|
|
575
580
|
let arr = []
|
|
@@ -626,7 +631,7 @@
|
|
|
626
631
|
},
|
|
627
632
|
|
|
628
633
|
selfSearch (args) {
|
|
629
|
-
this.editsort=false
|
|
634
|
+
this.editsort = false
|
|
630
635
|
args.condition = `${args.condition} and f_meter_book_num = '${this.f_meterbook_num}'`
|
|
631
636
|
this.condition = args.condition
|
|
632
637
|
this.model.search(args.condition, args.model)
|
|
@@ -644,20 +649,17 @@
|
|
|
644
649
|
},
|
|
645
650
|
events: {
|
|
646
651
|
onFileUpload: function (file, res) {
|
|
647
|
-
// let URL = res.f_downloadpath.substring(res.f_downloadpath.lastIndexOf(":\\") + 2)
|
|
648
|
-
// res.f_downloadpath = "http://" + location.host + "/" + URL
|
|
649
|
-
// res.f_downloadpath.replace('\\','/')
|
|
650
652
|
this.$resetpost('rs/logic/upLoadBookFile',
|
|
651
653
|
{data: {
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
654
|
+
condition: this.condition,
|
|
655
|
+
filepath: res.f_downloadpath
|
|
656
|
+
}
|
|
655
657
|
},
|
|
656
658
|
{resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
659
|
+
this.show = false
|
|
660
|
+
this.$showAlert(`导入成功`, 'success', 2000)
|
|
661
|
+
this.search()
|
|
662
|
+
})
|
|
661
663
|
}
|
|
662
664
|
},
|
|
663
665
|
computed: {
|