manage-client 3.3.101 → 3.3.103
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 +11 -2
- package/package.json +2 -2
- package/src/components/BasisEcharts/businessQuery/chargeQueryEcharts.vue +86 -0
- package/src/components/BasisEcharts/businessQuery/userOpenEcharts.vue +65 -0
- package/src/components/sale/businessquery/ChargeQuery.vue +7 -1
- package/src/components/sale/businessquery/GroupChargeQuery.vue +11 -0
- package/src/components/sale/config/exportConfig.js +2 -2
- package/src/components/sale/filesquery/UserQuery.vue +6 -1
- package/src/filiale/qianneng/ChargeQuery.vue +3 -1
- package/src/filiale/shexian/ChargeQuery.vue +6 -1
- package/src/filiale/shexian/UserQuery.vue +6 -1
- package/src/main.js +1 -3
- package/src/saleManage.js +4 -0
package/build/dev-server.js
CHANGED
|
@@ -19,9 +19,9 @@ 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 bendi = 'http://192.168.50.
|
|
22
|
+
var bendi = 'http://192.168.50.67:31785'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://192.168.50.
|
|
24
|
+
var wode = 'http://192.168.50.67:31785'
|
|
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'
|
|
@@ -29,6 +29,12 @@ var proxyTable = {
|
|
|
29
29
|
'/rs/logic/exportfile': {
|
|
30
30
|
target: bendi
|
|
31
31
|
},
|
|
32
|
+
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
33
|
+
target: 'http://localhost:8084/'
|
|
34
|
+
},
|
|
35
|
+
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
36
|
+
target: 'http://localhost:8084/'
|
|
37
|
+
},
|
|
32
38
|
'/files': {
|
|
33
39
|
target: bendi
|
|
34
40
|
},
|
|
@@ -84,6 +90,9 @@ var proxyTable = {
|
|
|
84
90
|
'/rs/sql/singleTable': {
|
|
85
91
|
target: bendi
|
|
86
92
|
},
|
|
93
|
+
'/rs/sql': {
|
|
94
|
+
target: 'http://localhost:8084/'
|
|
95
|
+
},
|
|
87
96
|
'/rs': {
|
|
88
97
|
target: wode
|
|
89
98
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.103",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"system-clients": "3.2.61",
|
|
72
72
|
"url-loader": "^0.5.7",
|
|
73
73
|
"vue-amap": "0.5.10",
|
|
74
|
-
"vue-client": "1.24.
|
|
74
|
+
"vue-client": "1.24.123",
|
|
75
75
|
"vue-hot-reload-api": "^1.2.0",
|
|
76
76
|
"vue-html-loader": "^1.0.0",
|
|
77
77
|
"vue-loader": "8.2.1",
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="row">
|
|
3
|
+
<div class="col-sm-12 chartsItem">
|
|
4
|
+
<chart-type-base title="用气性质-金额" type="pie"
|
|
5
|
+
:data="chartsData_fee"></chart-type-base>
|
|
6
|
+
</div>
|
|
7
|
+
<div class="col-sm-12 chartsItem">
|
|
8
|
+
<chart-type-base title="用气性质-气量" type="pie" :data="chartsData_gas"></chart-type-base>
|
|
9
|
+
</div>
|
|
10
|
+
<div class="col-sm-12 chartsItem" v-if="chartsData_both.length">
|
|
11
|
+
<chart-type-base title="用气性质-气量/金额" :data="chartsData_both" type="bar"></chart-type-base>
|
|
12
|
+
</div>
|
|
13
|
+
<div class="col-sm-12 chartsItem" v-if="chartsData_line.length > 2">
|
|
14
|
+
<chart-type-base title="营收曲线-用气性质" type="line" :smooth="true"
|
|
15
|
+
:data="chartsData_line"></chart-type-base>
|
|
16
|
+
</div>
|
|
17
|
+
</div>
|
|
18
|
+
</template>
|
|
19
|
+
|
|
20
|
+
<script>
|
|
21
|
+
import ChartTypeBase from 'vue-client/src/components/echarts/ChartTypeBase.vue'
|
|
22
|
+
import {HttpResetClass} from "vue-client";
|
|
23
|
+
|
|
24
|
+
export default {
|
|
25
|
+
name: "chargeQueryEcharts",
|
|
26
|
+
components: {
|
|
27
|
+
ChartTypeBase
|
|
28
|
+
},
|
|
29
|
+
props: ['data'],
|
|
30
|
+
data() {
|
|
31
|
+
return {
|
|
32
|
+
chartsData_fee: {},
|
|
33
|
+
chartsData_gas: {},
|
|
34
|
+
chartsData_both: [],
|
|
35
|
+
chartsData_line: [],
|
|
36
|
+
}
|
|
37
|
+
},
|
|
38
|
+
methods: {
|
|
39
|
+
async getData() {
|
|
40
|
+
this.chartsData_fee = {}
|
|
41
|
+
this.chartsData_gas = {}
|
|
42
|
+
this.chartsData_both = []
|
|
43
|
+
let load = new HttpResetClass()
|
|
44
|
+
await load.load("POST", 'rs/sql/chargeQuery_by_gasproperties',
|
|
45
|
+
{data: Object.assign(this.data, {groupitem: "f_gasproperties"})},
|
|
46
|
+
{resolveMsg: null, rejectMsg: null})
|
|
47
|
+
.then(async (res) => {
|
|
48
|
+
res.data.forEach(item => {
|
|
49
|
+
this.chartsData_fee[item.groupitem] = item.f_preamount
|
|
50
|
+
this.chartsData_gas[item.groupitem] = item.f_pregas
|
|
51
|
+
this.chartsData_both.push({
|
|
52
|
+
product: item.groupitem,
|
|
53
|
+
'气量': item.f_pregas,
|
|
54
|
+
'金额': item.f_preamount
|
|
55
|
+
})
|
|
56
|
+
})
|
|
57
|
+
this.chartsData_fee = Object.assign({}, this.chartsData_fee)
|
|
58
|
+
this.chartsData_gas = Object.assign({}, this.chartsData_gas)
|
|
59
|
+
// 获取折线图数据
|
|
60
|
+
await load.load("POST", 'rs/logic/chargeQuery_by_gasproperties_line',
|
|
61
|
+
{data: Object.assign(this.data, {result: res.data})},
|
|
62
|
+
{resolveMsg: null, rejectMsg: null})
|
|
63
|
+
.then((res) => {
|
|
64
|
+
this.chartsData_line = res.data
|
|
65
|
+
})
|
|
66
|
+
})
|
|
67
|
+
}
|
|
68
|
+
},
|
|
69
|
+
watch: {},
|
|
70
|
+
ready() {
|
|
71
|
+
this.getData()
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
</script>
|
|
75
|
+
|
|
76
|
+
<style scoped>
|
|
77
|
+
.chartsItem {
|
|
78
|
+
height: 300px;
|
|
79
|
+
margin-bottom: 20px;
|
|
80
|
+
background-color: #fff;
|
|
81
|
+
border-radius: 4px;
|
|
82
|
+
border: 1px solid #e5e5e5;
|
|
83
|
+
padding: 10px;
|
|
84
|
+
box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
|
|
85
|
+
}
|
|
86
|
+
</style>
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="row">
|
|
3
|
+
<div class="col-sm-12 chartsItem" v-if="chartsData_line">
|
|
4
|
+
<chart-type-base title="开户曲线" type="line" :smooth="true"
|
|
5
|
+
:data="chartsData_line"></chart-type-base>
|
|
6
|
+
</div>
|
|
7
|
+
<!-- loding-->
|
|
8
|
+
<div class="col-sm-12 chartsItem" v-if="!chartsData_line">
|
|
9
|
+
<div class="loading">
|
|
10
|
+
<div class="loading-text">加载中...</div>
|
|
11
|
+
</div>
|
|
12
|
+
</div>
|
|
13
|
+
</div>
|
|
14
|
+
</template>
|
|
15
|
+
|
|
16
|
+
<script>
|
|
17
|
+
import ChartTypeBase from 'vue-client/src/components/echarts/ChartTypeBase.vue'
|
|
18
|
+
import {HttpResetClass} from "vue-client";
|
|
19
|
+
|
|
20
|
+
export default {
|
|
21
|
+
name: "chargeQueryEcharts",
|
|
22
|
+
components: {
|
|
23
|
+
ChartTypeBase
|
|
24
|
+
},
|
|
25
|
+
props: ['data'],
|
|
26
|
+
data() {
|
|
27
|
+
return {
|
|
28
|
+
chartsData_line: null,
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
methods: {
|
|
32
|
+
async getData() {
|
|
33
|
+
let load = new HttpResetClass()
|
|
34
|
+
let chartsData_line = {}
|
|
35
|
+
await load.load("POST", 'rs/sql/userOpenEcharts',
|
|
36
|
+
{data: Object.assign(this.data)},
|
|
37
|
+
{resolveMsg: null, rejectMsg: null})
|
|
38
|
+
.then(async (res) => {
|
|
39
|
+
if (res.data.length > 1){
|
|
40
|
+
res.data.forEach(item=>{
|
|
41
|
+
chartsData_line[item.f_open_date] = item.c
|
|
42
|
+
})
|
|
43
|
+
}
|
|
44
|
+
})
|
|
45
|
+
this.chartsData_line = Object.assign({}, chartsData_line)
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
watch: {},
|
|
49
|
+
ready() {
|
|
50
|
+
this.getData()
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
</script>
|
|
54
|
+
|
|
55
|
+
<style scoped>
|
|
56
|
+
.chartsItem {
|
|
57
|
+
height: 300px;
|
|
58
|
+
margin-bottom: 20px;
|
|
59
|
+
background-color: #fff;
|
|
60
|
+
border-radius: 4px;
|
|
61
|
+
border: 1px solid #e5e5e5;
|
|
62
|
+
padding: 10px;
|
|
63
|
+
box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
|
|
64
|
+
}
|
|
65
|
+
</style>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div id="unit" class="flex-row">
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex" :class="{showbottom:showbottomsum}" v-if="!show">
|
|
5
|
-
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
5
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort" :drawer="true" drawertitle="收费查询">
|
|
6
6
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
|
|
7
7
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
8
|
<div class="row">
|
|
@@ -773,6 +773,12 @@
|
|
|
773
773
|
</template>
|
|
774
774
|
<template partial='foot'></template>
|
|
775
775
|
</data-grid>
|
|
776
|
+
<template partial='other'>
|
|
777
|
+
<charge-query-echarts
|
|
778
|
+
:data="$parent.getCondition"
|
|
779
|
+
sqlurl="chargeQuery"
|
|
780
|
+
></charge-query-echarts>
|
|
781
|
+
</template>
|
|
776
782
|
</criteria-paged>
|
|
777
783
|
<table class="table-hover">
|
|
778
784
|
<tr style="position: relative" class="table-bordered">
|
|
@@ -91,6 +91,11 @@
|
|
|
91
91
|
condition="f_state in {}"
|
|
92
92
|
close-on-select></v-select>
|
|
93
93
|
</div>
|
|
94
|
+
<div class="col-sm-2 form-group">
|
|
95
|
+
<label class="font_normal_body">团缴编号</label>
|
|
96
|
+
<input type="text" style="width:60%" class="input_search" v-model="model.f_customer"
|
|
97
|
+
condition="f_customer like '%{}%'" placeholder="团缴编号">
|
|
98
|
+
</div>
|
|
94
99
|
</div>
|
|
95
100
|
</div>
|
|
96
101
|
</criteria>
|
|
@@ -101,6 +106,9 @@
|
|
|
101
106
|
<th>
|
|
102
107
|
<nobr>收费编号</nobr>
|
|
103
108
|
</th>
|
|
109
|
+
<th>
|
|
110
|
+
<nobr>团缴编号</nobr>
|
|
111
|
+
</th>
|
|
104
112
|
<th>
|
|
105
113
|
<nobr>客户姓名</nobr>
|
|
106
114
|
</th>
|
|
@@ -172,6 +180,9 @@
|
|
|
172
180
|
<td style="text-align: center;">
|
|
173
181
|
<nobr>{{row.id}}</nobr>
|
|
174
182
|
</td>
|
|
183
|
+
<td style="text-align: center;">
|
|
184
|
+
<nobr>{{row.f_customer}}</nobr>
|
|
185
|
+
</td>
|
|
175
186
|
<td style="text-align: center;">
|
|
176
187
|
<nobr>{{row.f_user_name}}</nobr>
|
|
177
188
|
</td>
|
|
@@ -52,7 +52,7 @@ export default{
|
|
|
52
52
|
'f_address': '客户地址'
|
|
53
53
|
},
|
|
54
54
|
meterConfig: {
|
|
55
|
-
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', '
|
|
55
|
+
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_userfiles_id': '表ID',
|
|
56
56
|
'f_user_phone': '客户电话', 'f_rent_phone': '备用电话', 'idnumber': '身份证号', 'f_address': '客户地址', 'f_book_slice_area': '表册片区',
|
|
57
57
|
'f_balance_amount': '表上余额', 'f_user_type': '客户类型', 'f_usetype': '使用类型', 'f_gasproperties': '用气性质',
|
|
58
58
|
'f_meternumber': '表号', 'f_card_id': '卡号', 'f_price_name': '气价名称', 'value': '气价详情', 'f_meter_brand': '气表品牌',
|
|
@@ -1033,7 +1033,7 @@ export default{
|
|
|
1033
1033
|
'finaltotal': '一日'
|
|
1034
1034
|
},
|
|
1035
1035
|
GroupCharge: {
|
|
1036
|
-
'id': '收费编号', 'f_user_name': '客户姓名', 'f_user_type': '客户类型', 'f_address': '客户地址','f_pregas': '气量','f_preamount': '气费','f_delay': '应交违约金','f_delaypay': '实交违约金',
|
|
1036
|
+
'id': '收费编号', 'f_customer': '团缴编号', 'f_user_name': '客户姓名', 'f_user_type': '客户类型', 'f_address': '客户地址','f_pregas': '气量','f_preamount': '气费','f_delay': '应交违约金','f_delaypay': '实交违约金',
|
|
1037
1037
|
'f_balance': '上期余额','f_curbalance': '本期余额','f_newbalance': '账户支出', 'f_newcurbalance': '账户存入', 'f_collection': '收款','f_state': '收费状态','f_operate_date': '收费日期','f_payment': '付款方式','f_type': '收费类型','f_comments': '备注',
|
|
1038
1038
|
'f_operator': '收费人','f_orgname': '部门','f_depname': '公司'
|
|
1039
1039
|
},
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search" v-if="!show">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" >
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort" :drawer="true" drawertitle="开户查询">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -504,6 +504,11 @@
|
|
|
504
504
|
<template partial='foot'>
|
|
505
505
|
</template>
|
|
506
506
|
</data-grid>
|
|
507
|
+
<template partial='other'>
|
|
508
|
+
<charge-query-echarts
|
|
509
|
+
:data="$parent.getCondition"
|
|
510
|
+
></charge-query-echarts>
|
|
511
|
+
</template>
|
|
507
512
|
</criteria-paged>
|
|
508
513
|
|
|
509
514
|
<table class="table-hover">
|
|
@@ -880,6 +880,7 @@
|
|
|
880
880
|
//小区
|
|
881
881
|
residentialArea: [],
|
|
882
882
|
sumsmodel: {},
|
|
883
|
+
condition: '',
|
|
883
884
|
f_filialeid: this.$login.f.orgid,
|
|
884
885
|
wxstate:[
|
|
885
886
|
{label: '全部', value: ''},
|
|
@@ -1077,6 +1078,7 @@
|
|
|
1077
1078
|
if (this.batchid) {
|
|
1078
1079
|
args.condition += ` and f_batch_id=${this.batchid}`
|
|
1079
1080
|
}
|
|
1081
|
+
this.condition = args.condition
|
|
1080
1082
|
this.model.search(args.condition, args.model)
|
|
1081
1083
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
1082
1084
|
this.card=''
|
|
@@ -1246,7 +1248,7 @@
|
|
|
1246
1248
|
return {
|
|
1247
1249
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
1248
1250
|
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
1249
|
-
condition: `${this
|
|
1251
|
+
condition: `${this.condition}` + this.orgCondtionStr,
|
|
1250
1252
|
orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
|
|
1251
1253
|
}
|
|
1252
1254
|
},
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div id="unit" class="flex-row">
|
|
3
3
|
<div class="basic-main" @keyup.enter="search">
|
|
4
4
|
<div class="flex" :class="{showbottom:showbottomsum}" v-if="!show">
|
|
5
|
-
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
5
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort" :drawer="true" drawertitle="收费查询">
|
|
6
6
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
|
|
7
7
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
8
|
<div class="row">
|
|
@@ -763,6 +763,11 @@
|
|
|
763
763
|
</template>
|
|
764
764
|
<template partial='foot'></template>
|
|
765
765
|
</data-grid>
|
|
766
|
+
<template partial='other'>
|
|
767
|
+
<charge-query-echarts
|
|
768
|
+
:data="$parent.getCondition"
|
|
769
|
+
></charge-query-echarts>
|
|
770
|
+
</template>
|
|
766
771
|
</criteria-paged>
|
|
767
772
|
<table class="table-hover">
|
|
768
773
|
<tr style="position: relative" class="table-bordered">
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="basic-main" @keyup.enter="search" v-if="!show">
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<div style="flex:1;" class="flex" >
|
|
6
|
-
<criteria-paged :model="model" v-ref:paged @sort="sort">
|
|
6
|
+
<criteria-paged :model="model" v-ref:paged @sort="sort" :drawer="true" drawertitle="开户查询">
|
|
7
7
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
@@ -547,6 +547,11 @@
|
|
|
547
547
|
<template partial='foot'>
|
|
548
548
|
</template>
|
|
549
549
|
</data-grid>
|
|
550
|
+
<template partial='other'>
|
|
551
|
+
<user-open-echarts
|
|
552
|
+
:data="$parent.getCondition"
|
|
553
|
+
></user-open-echarts>
|
|
554
|
+
</template>
|
|
550
555
|
</criteria-paged>
|
|
551
556
|
|
|
552
557
|
<table class="table-hover">
|
package/src/main.js
CHANGED
|
@@ -6,8 +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/
|
|
10
|
-
import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
|
|
9
|
+
import ShanXianSaleManage from './filiale/shexian/sale'
|
|
11
10
|
import webmeterManage from './webmeterManage'
|
|
12
11
|
import reportManage from './reportManage'
|
|
13
12
|
import newmanage from './newmanage'
|
|
@@ -49,7 +48,6 @@ system(false)
|
|
|
49
48
|
saleManage()
|
|
50
49
|
ShanXianSaleManage()
|
|
51
50
|
webmeterManage()
|
|
52
|
-
ShanXianWebmeterManage()
|
|
53
51
|
ManageHome()
|
|
54
52
|
newmanage()
|
|
55
53
|
reportManage()
|
package/src/saleManage.js
CHANGED
|
@@ -668,4 +668,8 @@ export default function () {
|
|
|
668
668
|
Vue.component('web-meter-month-gas-guery', (resolve) => { require(['./components/sale/businessquery/WebMeterMonthGasQuery'], resolve) })
|
|
669
669
|
// 批量打印票据
|
|
670
670
|
Vue.component('manage-batch-print-bill', (resolve) => { require(['./components/sale/common/BatchPrintBill'], resolve) })
|
|
671
|
+
|
|
672
|
+
// 图表组件
|
|
673
|
+
Vue.component('charge-query-echarts', (resolve) => { require(['./components/BasisEcharts/businessQuery/chargeQueryEcharts'], resolve) })
|
|
674
|
+
Vue.component('user-open-echarts', (resolve) => { require(['./components/BasisEcharts/businessQuery/userOpenEcharts'], resolve) })
|
|
671
675
|
}
|