manage-client 3.3.108 → 3.3.109
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/build/dev-server.js
CHANGED
|
@@ -19,82 +19,91 @@ var qtx= 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var
|
|
22
|
+
var server = 'http://192.168.50.4:8400'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var
|
|
24
|
+
var local = 'http://127.0.0.1:8084'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
28
28
|
var proxyTable = {
|
|
29
29
|
'/rs/logic/exportfile': {
|
|
30
|
-
target:
|
|
30
|
+
target: server
|
|
31
31
|
},
|
|
32
32
|
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
33
|
-
target:
|
|
33
|
+
target: local
|
|
34
34
|
},
|
|
35
35
|
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
36
|
-
target:
|
|
36
|
+
target: local
|
|
37
37
|
},
|
|
38
38
|
'/files': {
|
|
39
|
-
target:
|
|
39
|
+
target: server
|
|
40
40
|
},
|
|
41
41
|
// 查找资源服务数据
|
|
42
42
|
'/rs/search': {
|
|
43
|
-
target:
|
|
43
|
+
target: server
|
|
44
44
|
},
|
|
45
45
|
// 查找资源服务数据
|
|
46
46
|
'/rs/logic/getLogin': {
|
|
47
|
-
target:
|
|
47
|
+
target: server
|
|
48
48
|
},
|
|
49
49
|
// 查找资源服务数据
|
|
50
50
|
'/rs/logic/getInitData': {
|
|
51
|
-
target:
|
|
51
|
+
target: server
|
|
52
52
|
},
|
|
53
53
|
'/rs/logic/getSaleInitData': {
|
|
54
|
-
target:
|
|
54
|
+
target: server
|
|
55
55
|
},
|
|
56
56
|
// 用户登录服务地址
|
|
57
57
|
'/rs/user': {
|
|
58
|
-
target:
|
|
58
|
+
target: server
|
|
59
59
|
},
|
|
60
60
|
'/rs/path/getParams': {
|
|
61
|
-
target:
|
|
61
|
+
target: server
|
|
62
62
|
},
|
|
63
63
|
'/rs/data': {
|
|
64
|
-
target:
|
|
64
|
+
target: server
|
|
65
65
|
},
|
|
66
66
|
'/rs/license': {
|
|
67
|
-
target:
|
|
67
|
+
target: server
|
|
68
68
|
},
|
|
69
69
|
'/rs/db': {
|
|
70
|
-
target:
|
|
70
|
+
target: server
|
|
71
71
|
},
|
|
72
72
|
'/excel': {
|
|
73
|
-
target:
|
|
73
|
+
target: server
|
|
74
74
|
},
|
|
75
75
|
'/rs/config': {
|
|
76
|
-
target:
|
|
76
|
+
target: server
|
|
77
77
|
},
|
|
78
78
|
'/rs/sql/getLicenseById': {
|
|
79
|
-
target:
|
|
79
|
+
target: server
|
|
80
80
|
},
|
|
81
81
|
'/rs/report': {
|
|
82
|
-
target:
|
|
82
|
+
target: server
|
|
83
83
|
},
|
|
84
84
|
'/rs/vue': {
|
|
85
|
-
target:
|
|
85
|
+
target: server
|
|
86
86
|
},
|
|
87
87
|
'/rs/file': {
|
|
88
|
-
target:
|
|
88
|
+
target: local
|
|
89
89
|
},
|
|
90
90
|
'/rs/sql/singleTable': {
|
|
91
|
-
target:
|
|
91
|
+
target: server
|
|
92
|
+
},
|
|
93
|
+
'/rs/sql/address': {
|
|
94
|
+
target: server
|
|
95
|
+
},
|
|
96
|
+
'/rs/sql/getFiles': {
|
|
97
|
+
target: server
|
|
92
98
|
},
|
|
93
99
|
'/rs/sql': {
|
|
94
|
-
target:
|
|
100
|
+
target: local
|
|
101
|
+
},
|
|
102
|
+
'/rs/logic': {
|
|
103
|
+
target: local
|
|
95
104
|
},
|
|
96
105
|
'/rs': {
|
|
97
|
-
target:
|
|
106
|
+
target: server
|
|
98
107
|
}
|
|
99
108
|
}
|
|
100
109
|
|
package/package.json
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
style="width:60%"
|
|
20
20
|
:value.sync="model.startDate"
|
|
21
21
|
:disabled-days-of-Week="[]"
|
|
22
|
-
:format="'yyyy-MM-dd'"
|
|
22
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
23
23
|
:show-reset-button="reset">
|
|
24
24
|
</datepicker>
|
|
25
25
|
</div>
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
style="width:60%"
|
|
31
31
|
:value.sync="model.endDate"
|
|
32
32
|
:disabled-days-of-Week="[]"
|
|
33
|
-
:format="'yyyy-MM-dd'"
|
|
33
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
34
34
|
:show-reset-button="reset">
|
|
35
35
|
</datepicker>
|
|
36
36
|
</div>
|
|
@@ -64,6 +64,22 @@
|
|
|
64
64
|
</div>
|
|
65
65
|
</div>
|
|
66
66
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
67
|
+
<div class="col-sm-2 form-group">
|
|
68
|
+
<label class="font_normal_body">客户状态  </label>
|
|
69
|
+
<v-select :value.sync="model.f_user_state"
|
|
70
|
+
v-model="model.f_user_state"
|
|
71
|
+
:options='$parent.$parent.userstates' placeholder='请选择'
|
|
72
|
+
condition="f_user_state = '{}'"
|
|
73
|
+
close-on-select></v-select>
|
|
74
|
+
</div>
|
|
75
|
+
<div class="col-sm-2 form-group">
|
|
76
|
+
<label class="font_normal_body">气表状态 </label>
|
|
77
|
+
<v-select :value.sync="model.f_table_state"
|
|
78
|
+
v-model="model.f_table_state"
|
|
79
|
+
:options='$parent.$parent.tablestate' placeholder='请选择'
|
|
80
|
+
condition="f_table_state = '{}'"
|
|
81
|
+
close-on-select></v-select>
|
|
82
|
+
</div>
|
|
67
83
|
<div class="col-sm-2 form-group">
|
|
68
84
|
<label class="font_normal_body">表  号 </label>
|
|
69
85
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
|
|
@@ -125,7 +141,7 @@
|
|
|
125
141
|
condition="f_book_slice_area = '{}'"></v-select>
|
|
126
142
|
</div>
|
|
127
143
|
<div class="col-sm-2 ">
|
|
128
|
-
<label for="f_meter_classify"class="font_normal_body"
|
|
144
|
+
<label for="f_meter_classify"class="font_normal_body">表类型  </label>
|
|
129
145
|
<v-select id="f_meter_classify"
|
|
130
146
|
v-model="model.meter_classify"
|
|
131
147
|
placeholder='表类型'
|
|
@@ -287,8 +303,8 @@
|
|
|
287
303
|
self.initParams()
|
|
288
304
|
self.initSlice(self.$login.f.orgid)
|
|
289
305
|
let year = new Date().getFullYear()
|
|
290
|
-
self.$refs.paged.$refs.cri.model.startDate = year+'-01-01'
|
|
291
|
-
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
306
|
+
self.$refs.paged.$refs.cri.model.startDate = year+'-01-01 00:00:00'
|
|
307
|
+
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
292
308
|
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
|
|
293
309
|
}
|
|
294
310
|
export default {
|
|
@@ -479,15 +495,15 @@
|
|
|
479
495
|
a += ` and f_book_slice_area = '${this.$refs.paged.$refs.cri.model.model.f_book_slice_area}'`
|
|
480
496
|
}
|
|
481
497
|
if(this.$refs.paged.$refs.cri.model.startDate){
|
|
482
|
-
this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}
|
|
498
|
+
this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}' `
|
|
483
499
|
}else{
|
|
484
|
-
this.model.params.startDate =
|
|
500
|
+
this.model.params.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
485
501
|
}
|
|
486
502
|
|
|
487
503
|
if(this.$refs.paged.$refs.cri.model.endDate){
|
|
488
|
-
this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}
|
|
504
|
+
this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}' `
|
|
489
505
|
}else{
|
|
490
|
-
this.model.params.endDate =
|
|
506
|
+
this.model.params.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
491
507
|
}
|
|
492
508
|
this.mycondition = a
|
|
493
509
|
args.condition = args.condition+ ` ${this.filialeCodeStr}`
|
|
@@ -514,6 +530,12 @@
|
|
|
514
530
|
|
|
515
531
|
},
|
|
516
532
|
computed: {
|
|
533
|
+
userstates (){
|
|
534
|
+
return this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
|
|
535
|
+
},
|
|
536
|
+
tablestate() {
|
|
537
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
|
|
538
|
+
},
|
|
517
539
|
getfield() {
|
|
518
540
|
return exportConfig.gasInspectionConfig
|
|
519
541
|
},
|
|
@@ -538,18 +560,18 @@
|
|
|
538
560
|
result.condition = result.condition + this.mycondition
|
|
539
561
|
let temp2 = this.$refs.paged.$refs.cri
|
|
540
562
|
if (temp2.model.startDate && temp2.model.endDate) {
|
|
541
|
-
result.startDate = ` '${temp2.model.startDate}
|
|
542
|
-
result.endDate = ` '${temp2.model.endDate}
|
|
563
|
+
result.startDate = ` '${temp2.model.startDate}'`
|
|
564
|
+
result.endDate = ` '${temp2.model.endDate}'`
|
|
543
565
|
} if (!temp2.model.startDate && !temp2.model.endDate) {
|
|
544
|
-
result.startDate =
|
|
545
|
-
result.endDate =
|
|
566
|
+
result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
567
|
+
result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
546
568
|
}
|
|
547
569
|
if (temp2.model.startDate&&!temp2.model.endDate) {
|
|
548
|
-
result.startDate = ` '${temp2.model.startDate}
|
|
549
|
-
result.endDate =
|
|
570
|
+
result.startDate = ` '${temp2.model.startDate}'`
|
|
571
|
+
result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
550
572
|
} if (temp2.model.endDate&&!temp2.model.startDate) {
|
|
551
|
-
result.startDate =
|
|
552
|
-
result.endDate = ` '${temp2.model.endDate}
|
|
573
|
+
result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
574
|
+
result.endDate = ` '${temp2.model.endDate}'`
|
|
553
575
|
}
|
|
554
576
|
if (temp2.model.contain_newfile==='否'){
|
|
555
577
|
result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
<read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn" v-ref:readcard></read-card>
|
|
43
43
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
44
44
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
45
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.serialNumber">流水号补录</button>
|
|
45
46
|
|
|
46
47
|
<export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
|
|
47
48
|
:field="$parent.$parent.getfield" :header="$parent.$parent.other"
|
|
@@ -81,7 +82,7 @@
|
|
|
81
82
|
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
82
83
|
</div>
|
|
83
84
|
<div class="col-sm-2 form-group">
|
|
84
|
-
<label class="font_normal_body"
|
|
85
|
+
<label class="font_normal_body" style="letter-spacing: 2em;margin-right: -2em">小区</label>
|
|
85
86
|
<v-select :value.sync="model.f_residential_area"
|
|
86
87
|
class="select_list select"
|
|
87
88
|
v-model="model.f_residential_area"
|
|
@@ -94,7 +95,7 @@
|
|
|
94
95
|
</div>
|
|
95
96
|
<div
|
|
96
97
|
class="col-sm-2 form-group">
|
|
97
|
-
<label class="font_normal_body"
|
|
98
|
+
<label class="font_normal_body" style="letter-spacing: 2em;margin-right: -2em" >区域</label>
|
|
98
99
|
<v-select
|
|
99
100
|
v-model="model.f_pcd"
|
|
100
101
|
placeholder='选择区域'
|
|
@@ -329,18 +330,26 @@
|
|
|
329
330
|
close-on-select></v-select>
|
|
330
331
|
</div>
|
|
331
332
|
<div class="col-sm-2 form-group">
|
|
332
|
-
<label class="font_normal_body">终端号</label>
|
|
333
|
+
<label class="font_normal_body" style="letter-spacing: 0.5em;margin-right: -0.5em">终端号</label>
|
|
333
334
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_terminal_num"
|
|
334
335
|
condition="f_terminal_num like '{}'" placeholder='终端号'>
|
|
335
336
|
</div>
|
|
336
337
|
<div class="col-sm-2 form-group">
|
|
337
|
-
<label class="font_normal_body"
|
|
338
|
+
<label class="font_normal_body" style="letter-spacing: 0.5em;margin-right: -0.5em">壁挂炉</label>
|
|
338
339
|
<v-select :value.sync="model.isbgl"
|
|
339
340
|
v-model="model.isbgl"
|
|
340
341
|
:options='$parent.$parent.bgl' placeholder='请选择'
|
|
341
342
|
condition="isbgl = '{}'"
|
|
342
343
|
close-on-select></v-select>
|
|
343
344
|
</div>
|
|
345
|
+
<div class="col-sm-2 form-group">
|
|
346
|
+
<label class="font_normal_body" style="text-align: center;letter-spacing: 0.5em;margin-right: -0.5em">是否有<br/>流水号</label>
|
|
347
|
+
<v-select :value.sync="model.ishaisnumber"
|
|
348
|
+
v-model="model.ishaisnumber"
|
|
349
|
+
:options='$parent.$parent.ishaisnumberoption' placeholder='请选择'
|
|
350
|
+
condition="{}"
|
|
351
|
+
close-on-select></v-select>
|
|
352
|
+
</div>
|
|
344
353
|
</div>
|
|
345
354
|
</div>
|
|
346
355
|
</criteria>
|
|
@@ -786,6 +795,25 @@
|
|
|
786
795
|
<footer slot="modal-footer" class="modal-footer">
|
|
787
796
|
</footer>
|
|
788
797
|
</modal>
|
|
798
|
+
<modal :show.sync="serialNumberModelShow" v-if="serialNumberModelShow" style="width:auto;" v-ref:modal middle backdrop="false">
|
|
799
|
+
<article slot="modal-body">
|
|
800
|
+
<div style="text-align: center" class="row">
|
|
801
|
+
|
|
802
|
+
<file-upload style="margin-left:100px;padding-top:20px" class="my-file-uploader" :name="'myFile' + uuid"
|
|
803
|
+
action="rs/file/uploadFile" tagname="文件上传"
|
|
804
|
+
accept=".doc, .docx, .xls, .xlsx, .jpg, .png, .gif, .bmp, .avi, .mp4, .wmv, .rmvb, .mov, .pdf"
|
|
805
|
+
:headers="{'username': this.$login.f.name, 'blodid': uuid,'businessid':uuid, 'fremarks': '','defname':'','fusetype':'收费'}"
|
|
806
|
+
v-ref:file></file-upload>
|
|
807
|
+
<div class="col-sm-8 form-group" style="margin-left:150px;padding-top:10px" :class="[!f_serial_number ? 'has-error' : '']">
|
|
808
|
+
<label class="font_normal_body">银行流水号</label>
|
|
809
|
+
<input type="text" style="width:60%" class="input_search" v-model="f_serial_number" placeholder='银行流水号'>
|
|
810
|
+
</div>
|
|
811
|
+
</div>
|
|
812
|
+
</article>
|
|
813
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
814
|
+
<button type="button" class="btn btn-primary" :disabled="!f_serial_number" @click="serialNumberConfirm">确定</button>
|
|
815
|
+
</footer>
|
|
816
|
+
</modal>
|
|
789
817
|
</div>
|
|
790
818
|
<high-meter-idcard :show.sync="false" v-ref:highcard ></high-meter-idcard>
|
|
791
819
|
</template>
|
|
@@ -834,6 +862,11 @@
|
|
|
834
862
|
data() {
|
|
835
863
|
return {
|
|
836
864
|
IdCardInfo:'',
|
|
865
|
+
serialNumberShow : false,
|
|
866
|
+
serialNumberModelShow : false,
|
|
867
|
+
// 随机数uuid
|
|
868
|
+
uuid: '',
|
|
869
|
+
f_serial_number: '',
|
|
837
870
|
card:'',
|
|
838
871
|
isSingleUser: null,
|
|
839
872
|
startDate1:'',
|
|
@@ -871,6 +904,7 @@
|
|
|
871
904
|
dep:[],
|
|
872
905
|
user:[]
|
|
873
906
|
},
|
|
907
|
+
operatornames: [],
|
|
874
908
|
model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
|
|
875
909
|
f_pregas: 0,
|
|
876
910
|
f_preamount: 0,
|
|
@@ -916,6 +950,7 @@
|
|
|
916
950
|
writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'},{label: '写卡失败',value: '写卡失败'}],
|
|
917
951
|
bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
|
|
918
952
|
allorgid:[],
|
|
953
|
+
ishaisnumberoption:[{label: '全部', value: ''},{label: '是', value: ' f_serial_number is not null '},{label: '否', value: ' f_serial_number is null '}],
|
|
919
954
|
tempfalg :false,
|
|
920
955
|
lastorgstr:'',
|
|
921
956
|
// pos设备列表
|
|
@@ -939,7 +974,44 @@
|
|
|
939
974
|
})
|
|
940
975
|
},
|
|
941
976
|
methods: {
|
|
942
|
-
|
|
977
|
+
async serialNumber (){
|
|
978
|
+
if (!this.serialNumberShow){
|
|
979
|
+
this.$showAlert('仅当查询自己的现金缴费操作时才可以进行流水号补录', 'warning', 3000)
|
|
980
|
+
return
|
|
981
|
+
}
|
|
982
|
+
this.serialNumberModelShow = true
|
|
983
|
+
this.f_serial_number = ''
|
|
984
|
+
this.uuid = this.guid()
|
|
985
|
+
},
|
|
986
|
+
serialNumberConfirm() {
|
|
987
|
+
let param = {
|
|
988
|
+
uuid: this.uuid,
|
|
989
|
+
f_serial_number: this.f_serial_number,
|
|
990
|
+
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
991
|
+
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
992
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
993
|
+
orderitem: this.orderitem ? `${this.orderitem}` : " f_operate_date desc"
|
|
994
|
+
}
|
|
995
|
+
let http = new HttpResetClass()
|
|
996
|
+
http.load('POST', 'rs/logic/serialNumberUpdate', param,
|
|
997
|
+
{resolveMsg: '操作成功', rejectMsg: null}).then((res) => {
|
|
998
|
+
this.serialNumberModelShow=false;
|
|
999
|
+
this.row = res.data[0]
|
|
1000
|
+
this.search()
|
|
1001
|
+
}).catch((error) => {
|
|
1002
|
+
this.serialNumberModelShow=false
|
|
1003
|
+
this.$showAlert('操作失败', 'error', 3000)
|
|
1004
|
+
this.search()
|
|
1005
|
+
})
|
|
1006
|
+
},
|
|
1007
|
+
guid() {
|
|
1008
|
+
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
|
|
1009
|
+
let r = Math.random() * 16 | 0,
|
|
1010
|
+
v = c == 'x' ? r : (r & 0x3 | 0x8)
|
|
1011
|
+
return v.toString(16)
|
|
1012
|
+
})
|
|
1013
|
+
},
|
|
1014
|
+
// 获取设备下拉选
|
|
943
1015
|
async getEquipment () {
|
|
944
1016
|
let HttpReset = new HttpResetClass()
|
|
945
1017
|
let param = {
|
|
@@ -1109,6 +1181,11 @@
|
|
|
1109
1181
|
args.condition +=` and f_idnumber='${this.IdCardInfo}'`
|
|
1110
1182
|
}
|
|
1111
1183
|
this.model.search(args.condition, args.model)
|
|
1184
|
+
let condition1 = this.operatornames.length && this.operatornames[0] === this.$login.f.id
|
|
1185
|
+
let condition2 = this.$refs.paged.$refs.cri.model.f_payment.length && this.$refs.paged.$refs.cri.model.f_payment[0].indexOf('现金') > -1
|
|
1186
|
+
console.log("========condition1",condition1)
|
|
1187
|
+
console.log("========condition2",condition2)
|
|
1188
|
+
this.serialNumberShow = condition1 && condition2
|
|
1112
1189
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
1113
1190
|
this.card=''
|
|
1114
1191
|
this.IdCardInfo=''
|
|
@@ -1140,8 +1217,7 @@
|
|
|
1140
1217
|
this.orgCondtionStr = condition
|
|
1141
1218
|
this.orgname = obj.orgnames[0]
|
|
1142
1219
|
this.depname = obj.depnames[0]
|
|
1143
|
-
|
|
1144
|
-
|
|
1220
|
+
this.operatornames = obj.operatornames
|
|
1145
1221
|
},
|
|
1146
1222
|
async updateParams() {
|
|
1147
1223
|
await this.$MagLoadParams.loadParam(this.f_filialeid)
|
|
@@ -1178,6 +1254,17 @@
|
|
|
1178
1254
|
'getidcard'(IdCard){
|
|
1179
1255
|
// console.log(param)
|
|
1180
1256
|
this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
|
|
1257
|
+
},
|
|
1258
|
+
'onFileUpload'(files,res){
|
|
1259
|
+
if(res && res.id ){
|
|
1260
|
+
let msg = '上传成功'
|
|
1261
|
+
if(!this.f_serial_number){
|
|
1262
|
+
msg = '上传成功,请填写流水号之后进行确认'
|
|
1263
|
+
}
|
|
1264
|
+
this.$showAlert(msg, 'success', 2000)
|
|
1265
|
+
}else{
|
|
1266
|
+
this.$showAlert('上传失败,请检查文件类型', 'warning', 2000)
|
|
1267
|
+
}
|
|
1181
1268
|
}
|
|
1182
1269
|
},
|
|
1183
1270
|
watch: {
|
package/src/main.js
CHANGED
|
@@ -6,7 +6,7 @@ import { all } from 'vue-client'
|
|
|
6
6
|
import { system } from 'system-clients'
|
|
7
7
|
import { ldap } from 'ldap-clients'
|
|
8
8
|
import saleManage from './saleManage'
|
|
9
|
-
import ShanXianSaleManage from './filiale/
|
|
9
|
+
import ShanXianSaleManage from './filiale/tongchuan/sale'
|
|
10
10
|
import webmeterManage from './webmeterManage'
|
|
11
11
|
import reportManage from './reportManage'
|
|
12
12
|
import newmanage from './newmanage'
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "manage-client",
|
|
3
|
-
"version": "3.2.174",
|
|
4
|
-
"description": "经营管控模块前台组件",
|
|
5
|
-
"main": "src/index.js",
|
|
6
|
-
"directories": {
|
|
7
|
-
"test": "test"
|
|
8
|
-
},
|
|
9
|
-
"dependencies": {
|
|
10
|
-
"swiper": "^5.4.5"
|
|
11
|
-
},
|
|
12
|
-
"devDependencies": {
|
|
13
|
-
"axios": "0.15.3",
|
|
14
|
-
"babel-core": "^6.0.0",
|
|
15
|
-
"babel-loader": "^6.0.0",
|
|
16
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
17
|
-
"babel-preset-es2015": "^6.0.0",
|
|
18
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
19
|
-
"chai": "^3.5.0",
|
|
20
|
-
"co": "^4.6.0",
|
|
21
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
22
|
-
"cross-env": "^1.0.7",
|
|
23
|
-
"cross-spawn": "^2.1.5",
|
|
24
|
-
"css-loader": "^0.23.0",
|
|
25
|
-
"echarts": "^4.1.0",
|
|
26
|
-
"eslint": "^2.0.0",
|
|
27
|
-
"eslint-config-standard": "^5.1.0",
|
|
28
|
-
"eslint-friendly-formatter": "^1.2.2",
|
|
29
|
-
"eslint-loader": "^1.3.0",
|
|
30
|
-
"eslint-plugin-html": "^1.3.0",
|
|
31
|
-
"eslint-plugin-promise": "^1.0.8",
|
|
32
|
-
"eslint-plugin-standard": "^1.3.2",
|
|
33
|
-
"eslint-plugin-vue": "^0.1.1",
|
|
34
|
-
"eventsource-polyfill": "^0.9.6",
|
|
35
|
-
"express": "^4.13.3",
|
|
36
|
-
"extract-text-webpack-plugin": "^1.0.1",
|
|
37
|
-
"filemanager-webpack-plugin": "^2.0.5",
|
|
38
|
-
"file-loader": "^0.8.4",
|
|
39
|
-
"function-bind": "^1.0.2",
|
|
40
|
-
"html-webpack-plugin": "^2.8.1",
|
|
41
|
-
"http-proxy-middleware": "^0.11.0",
|
|
42
|
-
"inject-loader": "^2.0.1",
|
|
43
|
-
"isparta-loader": "^2.0.0",
|
|
44
|
-
"jasmine-core": "^2.4.1",
|
|
45
|
-
"jquery": "^3.3.1",
|
|
46
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
47
|
-
"json-loader": "^0.5.4",
|
|
48
|
-
"karma": "^1.4.1",
|
|
49
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
50
|
-
"karma-coverage": "^1.1.1",
|
|
51
|
-
"karma-mocha": "^1.3.0",
|
|
52
|
-
"karma-sinon-chai": "^1.3.1",
|
|
53
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
54
|
-
"karma-spec-reporter": "0.0.31",
|
|
55
|
-
"karma-webpack": "^2.0.2",
|
|
56
|
-
"ldap-clients": "3.0.28",
|
|
57
|
-
"less": "^2.7.3",
|
|
58
|
-
"mkdirp": "^0.5.1",
|
|
59
|
-
"mocha": "^3.2.0",
|
|
60
|
-
"moment": "2.24.0",
|
|
61
|
-
"ncp": "^2.0.0",
|
|
62
|
-
"rimraf": "^2.5.0",
|
|
63
|
-
"sale-client": "3.4.14",
|
|
64
|
-
"selenium-server": "2.52.0",
|
|
65
|
-
"sinon": "^2.1.0",
|
|
66
|
-
"sinon-chai": "^2.8.0",
|
|
67
|
-
"style": "0.0.3",
|
|
68
|
-
"style-loader": "^0.20.3",
|
|
69
|
-
"swiper": "^5.4.5",
|
|
70
|
-
"system-clients": "3.1.89-20",
|
|
71
|
-
"url-loader": "^0.5.7",
|
|
72
|
-
"vue-amap": "0.5.10",
|
|
73
|
-
"vue-client": "1.24.51",
|
|
74
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
75
|
-
"vue-html-loader": "^1.0.0",
|
|
76
|
-
"vue-loader": "8.2.1",
|
|
77
|
-
"vue-resource": "^1.5.0",
|
|
78
|
-
"vue-router": "^0.7.13",
|
|
79
|
-
"vue-strap": "^1.0.9",
|
|
80
|
-
"vue-style-loader": "^1.0.0",
|
|
81
|
-
"vue-validator": "2.1.7",
|
|
82
|
-
"webpack": "1.12.2",
|
|
83
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
84
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
85
|
-
"webpack-merge": "^0.8.3",
|
|
86
|
-
"webpack-parallel-uglify-plugin": "^1.0.0"
|
|
87
|
-
},
|
|
88
|
-
"scripts": {
|
|
89
|
-
"unit": "karma start test/unit/karma.conf.js --single-run",
|
|
90
|
-
"example": "node build/example-server.js",
|
|
91
|
-
"dev": "node build/dev-server.js",
|
|
92
|
-
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
93
|
-
"build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
94
|
-
"buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
95
|
-
"buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
96
|
-
"buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
97
|
-
"e2e": "node test/e2e/runner.js",
|
|
98
|
-
"release": "bash build/release.sh"
|
|
99
|
-
},
|
|
100
|
-
"repository": {
|
|
101
|
-
"type": "git",
|
|
102
|
-
"url": "https://gitee.com/aote/management_modules.git"
|
|
103
|
-
},
|
|
104
|
-
"keywords": [
|
|
105
|
-
"manage"
|
|
106
|
-
],
|
|
107
|
-
"author": "liuxudong",
|
|
108
|
-
"license": "ISC"
|
|
109
|
-
}
|