manage-client 3.1.29 → 3.1.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/components/SellReport/ChargePrick.vue +49 -15
- package/src/components/SellReport/FinanceSellType.vue +254 -0
- package/src/components/SellReport/ManageBusSummary.vue +233 -233
- package/src/components/SellReport/SellCollect.vue +183 -0
- package/src/components/daping/DataManagement.vue +10 -21
- package/src/components/daping/ManageMain.vue +5 -2
- package/src/components/daping/RedactDaPing.vue +94 -80
- package/src/components/qinhua/SellEcharts.vue +2 -2
- package/src/components/sale/businessquery/ChargeQuery.vue +1 -1
- package/src/components/sale/businessquery/FillGasQuery.vue +16 -0
- package/src/components/sale/config/exportConfig.js +1 -1
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +52 -3
- package/src/reportManage.js +4 -0
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
<div class="flex-row" style="height:
|
|
4
|
+
<div class="flex-row" style="height: 49%">
|
|
5
5
|
<div id="top-left">
|
|
6
6
|
<!-- <div class="flex background-left-bottom">-->
|
|
7
|
-
<div class="flex background-
|
|
7
|
+
<div class="flex background-left-top">
|
|
8
8
|
<net-work-ping></net-work-ping>
|
|
9
9
|
</div>
|
|
10
10
|
</div>
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
</div>
|
|
17
17
|
<div id="top-right" >
|
|
18
18
|
|
|
19
|
-
<div class="flex background-
|
|
19
|
+
<div class="flex background-right-top">
|
|
20
20
|
|
|
21
21
|
<div class="flex" >
|
|
22
22
|
<div class="flex-row" style="height: 40%;margin-top: 2%;">
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
<span class="font-title">安检</span>
|
|
27
27
|
</div>
|
|
28
28
|
<div class="flex-inline col-sm-6 auto" >
|
|
29
|
-
<span id="weiruhu">
|
|
29
|
+
<span id="weiruhu">{{checkData.wrhsum > 10000 ? (checkData.wrhsum/10000).toFixed(0) + '万' : checkData.wrhsum}}</span>
|
|
30
30
|
</div>
|
|
31
31
|
<div class="flex-inline col-sm-6 auto" >
|
|
32
|
-
<span id="anjian">
|
|
32
|
+
<span id="anjian">{{checkData.jhsum > 10000 ? (checkData.jhsum/10000).toFixed(0) + '万' : checkData.jhsum}}</span>
|
|
33
33
|
</div>
|
|
34
34
|
<div class="flex-inline col-sm-6 auto" >
|
|
35
35
|
<span class="normal-font" >三年未入户总数</span>
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
</div>
|
|
53
53
|
|
|
54
54
|
</div>
|
|
55
|
-
<div class="flex-row " style="height:
|
|
55
|
+
<div class="flex-row " style="height: 48%;margin-top: 1%;">
|
|
56
56
|
|
|
57
57
|
<div class="flex background-left-bottom" style="height: 100%;width: 49%;margin-right: 1%">
|
|
58
58
|
|
|
@@ -98,6 +98,7 @@ export default {
|
|
|
98
98
|
url:'getDapingStationMap',
|
|
99
99
|
data:{}
|
|
100
100
|
},
|
|
101
|
+
checkData:{},
|
|
101
102
|
dane1:[],
|
|
102
103
|
dane2:[],
|
|
103
104
|
dane3:[],
|
|
@@ -116,21 +117,9 @@ export default {
|
|
|
116
117
|
this.changeshow = !this.changeshow
|
|
117
118
|
console.log(this.changeshow)
|
|
118
119
|
let http = new HttpResetClass()
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
// for (let i = 0; i < res.data.length; i++) {
|
|
123
|
-
// console.log(res.data[i])
|
|
124
|
-
// let info = {
|
|
125
|
-
// f_name : res.data[i].f_name,
|
|
126
|
-
// f_cumulative_flow : res.data[i].f_cumulative_flow,
|
|
127
|
-
// f_input_pressure : res.data[i].f_input_pressure,
|
|
128
|
-
// f_instantaneous_flow : res.data[i].f_instantaneous_flow,
|
|
129
|
-
// f_output_pressure : res.data[i].f_output_pressure
|
|
130
|
-
// }
|
|
131
|
-
// this.datas2.push(info)
|
|
132
|
-
// }
|
|
133
|
-
// })
|
|
120
|
+
await http.load('post', '/rs/sql/getCheckSum', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
|
|
121
|
+
this.checkData = res.data[0]
|
|
122
|
+
})
|
|
134
123
|
// await http.load('post', '/rs/sql/getHeatStationTable', {data:{}}, {rejectMsg: null, resolveMsg: null}).then((res)=>{
|
|
135
124
|
// console.log('热源厂---------------')
|
|
136
125
|
// console.log(res)
|
|
@@ -12,7 +12,10 @@
|
|
|
12
12
|
|
|
13
13
|
录入</span>
|
|
14
14
|
</div>
|
|
15
|
-
<
|
|
15
|
+
<div style="height: 93%;">
|
|
16
|
+
<qh-data-management :changeshow=showChart2></qh-data-management>
|
|
17
|
+
</div>
|
|
18
|
+
|
|
16
19
|
|
|
17
20
|
</div>
|
|
18
21
|
<div class=' main background-qinhua' style="overflow: hidden" v-if="showChart2">
|
|
@@ -26,8 +29,8 @@
|
|
|
26
29
|
<span class="title_main" style="vertical-align:right;background: url('../../../static/NewManageHome/矩形1186拷贝.png')" @click="showCharts('数据化管理')" b>
|
|
27
30
|
|
|
28
31
|
录入</span>
|
|
29
|
-
<redact-da-ping ></redact-da-ping>
|
|
30
32
|
</div>
|
|
33
|
+
<redact-da-ping></redact-da-ping>
|
|
31
34
|
<!-- <div class="title-main" style="height: 7%">-->
|
|
32
35
|
<!-- <span class="title_main" style="vertical-align:left;background: url('../../../static/NewManageHome/矩形1186.png')" @click="showCharts('燃气数据展示')">-->
|
|
33
36
|
|
|
@@ -1,93 +1,107 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="flex" style="
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
<div
|
|
6
|
-
<
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
2
|
+
<div class="flex container-fluid" style="height:100%;">
|
|
3
|
+
<div style="width: 100%;height:45%;">
|
|
4
|
+
<h3 class="row" style="text-align: center;height:10%;">管网信息录入</h3>
|
|
5
|
+
<div style="height:88%;margin-bottom: 2%;">
|
|
6
|
+
<div class="col-sm-9" style="overflow-y: auto;">
|
|
7
|
+
<div class="row" style="height: 15%;" v-for="(index,item) in netWorkAll">
|
|
8
|
+
<div class="col-sm-2 form-group">
|
|
9
|
+
<label class="font_normal_body">类型</label>
|
|
10
|
+
<v-select :value.sync="item.f_type" v-model="item.f_type"
|
|
11
|
+
title="参数: 管网类型(大屏信息录入)"
|
|
12
|
+
:options='networktype' placeholder='类型'
|
|
13
|
+
:value-single="true"
|
|
14
|
+
style="width:60%"
|
|
15
|
+
:search="false"
|
|
16
|
+
close-on-select></v-select>
|
|
17
|
+
</div>
|
|
18
|
+
<div class="col-sm-2 form-group">
|
|
19
|
+
<label class="font_normal_body">已建数</label>
|
|
20
|
+
<input type="text" style="width:60%" class="input_search" v-model="item.f_yijian"
|
|
21
|
+
placeholder="已建数">
|
|
22
|
+
</div>
|
|
23
|
+
<div class="col-sm-2 form-group">
|
|
24
|
+
<label class="font_normal_body">在建数</label>
|
|
25
|
+
<input type="text" style="width:60%" class="input_search" v-model="item.f_zaijian"
|
|
26
|
+
placeholder="在建数">
|
|
27
|
+
</div>
|
|
28
|
+
<div class="col-sm-2 form-group">
|
|
29
|
+
<label class="font_normal_body">审批数</label>
|
|
30
|
+
<input type="text" style="width:60%" class="input_search" v-model="item.f_shenpi"
|
|
31
|
+
placeholder="审批数">
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
<div class="col-sm-3" style="text-align: center;">
|
|
36
|
+
<button class="button_clear button_spacing" @click="add(1)">＋</button>
|
|
37
|
+
<button class="button_clear button_spacing" @click="remove(1)">一</button>
|
|
38
|
+
<button class="button_search button_spacing" @click="redactSave(1)">保存</button>
|
|
39
|
+
</div>
|
|
29
40
|
</div>
|
|
30
41
|
</div>
|
|
31
|
-
<div class="row" style="text-align: right">
|
|
32
|
-
<button class="button_clear button_spacing" @click="add(1)">＋</button>
|
|
33
|
-
<button class="button_clear button_spacing" @click="remove(1)">一</button>
|
|
34
|
-
<button class="button_search button_spacing" @click="redactSave(1)">保存</button>
|
|
35
|
-
</div>
|
|
36
42
|
|
|
37
43
|
|
|
38
|
-
<h3 class="row" style="text-align: center;">收费信息录入</h3>
|
|
39
|
-
<div class="row" v-for="(index,item) in sellingAll">
|
|
40
|
-
<div class="col-sm-2 form-group">
|
|
41
|
-
<label class="font_normal_body">营业厅</label>
|
|
42
|
-
<v-select :value.sync="item.f_depname" v-model="item.f_depname"
|
|
43
|
-
:search="false"
|
|
44
|
-
:value-single="true"
|
|
45
|
-
title="参数: 营业厅(大屏信息录入)"
|
|
46
|
-
:options='depname' placeholder='营业厅'
|
|
47
|
-
style="width:60%"
|
|
48
|
-
close-on-select></v-select>
|
|
49
|
-
</div>
|
|
50
|
-
<div class="col-sm-2 form-group">
|
|
51
|
-
<label class="font_normal_body">用户类型</label>
|
|
52
|
-
<v-select :value.sync="item.f_user_type" v-model="item.f_user_type"
|
|
53
|
-
:search="false"
|
|
54
|
-
:value-single="true"
|
|
55
|
-
title="参数: 用户类型"
|
|
56
|
-
:options='usertype' placeholder='用户类型'
|
|
57
|
-
style="width:60%"
|
|
58
|
-
close-on-select></v-select>
|
|
59
44
|
|
|
45
|
+
<div style="width: 100%;height:45%;margin-top: 2%">
|
|
46
|
+
<h3 class="row" style="text-align: center;height: 10%;">收费信息录入</h3>
|
|
47
|
+
<div style="height:88%;margin-bottom: 2%;">
|
|
48
|
+
<div class="col-sm-9" style="overflow-y: auto;">
|
|
49
|
+
<div class="row" style="height: 15%;" v-for="(index,item) in sellingAll">
|
|
50
|
+
<div class="col-sm-2 form-group">
|
|
51
|
+
<label class="font_normal_body">营业厅</label>
|
|
52
|
+
<v-select :value.sync="item.f_depname" v-model="item.f_depname"
|
|
53
|
+
:search="false"
|
|
54
|
+
:value-single="true"
|
|
55
|
+
title="参数: 营业厅(大屏信息录入)"
|
|
56
|
+
:options='depname' placeholder='营业厅'
|
|
57
|
+
style="width:60%"
|
|
58
|
+
close-on-select></v-select>
|
|
59
|
+
</div>
|
|
60
|
+
<div class="col-sm-2 form-group">
|
|
61
|
+
<label class="font_normal_body">用户类型</label>
|
|
62
|
+
<v-select :value.sync="item.f_user_type" v-model="item.f_user_type"
|
|
63
|
+
:search="false"
|
|
64
|
+
:value-single="true"
|
|
65
|
+
title="参数: 用户类型"
|
|
66
|
+
:options='usertype' placeholder='用户类型'
|
|
67
|
+
style="width:60%"
|
|
68
|
+
close-on-select></v-select>
|
|
69
|
+
|
|
70
|
+
</div>
|
|
71
|
+
<div class="col-sm-2 form-group">
|
|
72
|
+
<label class="font_normal_body">售气笔数</label>
|
|
73
|
+
<input type="text" style="width:60%" class="input_search" v-model="item.f_count"
|
|
74
|
+
placeholder="售气笔数">
|
|
75
|
+
</div>
|
|
76
|
+
<div class="col-sm-2 form-group">
|
|
77
|
+
<label class="font_normal_body">售气量</label>
|
|
78
|
+
<input type="text" style="width:60%" class="input_search" v-model="item.f_gas"
|
|
79
|
+
placeholder="售气量">
|
|
80
|
+
</div>
|
|
81
|
+
<div class="col-sm-2 form-group">
|
|
82
|
+
<label class="font_normal_body">售气金额</label>
|
|
83
|
+
<input type="text" style="width:60%" class="input_search" v-model="item.f_money"
|
|
84
|
+
placeholder="售气金额">
|
|
85
|
+
</div>
|
|
86
|
+
<div class="col-sm-2 form-group">
|
|
87
|
+
<label class="font_normal_body">归属时间</label>
|
|
88
|
+
<datepicker placeholder="归属时间" style="width:60%"
|
|
89
|
+
v-model="item.f_date"
|
|
90
|
+
:value.sync="item.f_date"
|
|
91
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
92
|
+
:show-reset-button="true">
|
|
93
|
+
</datepicker>
|
|
94
|
+
</div>
|
|
95
|
+
</div>
|
|
60
96
|
</div>
|
|
61
|
-
<div class="col-sm-
|
|
62
|
-
<
|
|
63
|
-
<
|
|
64
|
-
|
|
65
|
-
</div>
|
|
66
|
-
<div class="col-sm-2 form-group">
|
|
67
|
-
<label class="font_normal_body">售气量</label>
|
|
68
|
-
<input type="text" style="width:60%" class="input_search" v-model="item.f_gas"
|
|
69
|
-
placeholder="售气量">
|
|
70
|
-
</div>
|
|
71
|
-
<div class="col-sm-2 form-group">
|
|
72
|
-
<label class="font_normal_body">售气金额</label>
|
|
73
|
-
<input type="text" style="width:60%" class="input_search" v-model="item.f_money"
|
|
74
|
-
placeholder="售气金额">
|
|
75
|
-
</div>
|
|
76
|
-
<div class="col-sm-2 form-group">
|
|
77
|
-
<label class="font_normal_body">归属时间</label>
|
|
78
|
-
<datepicker placeholder="归属时间" style="width:60%"
|
|
79
|
-
v-model="item.f_date"
|
|
80
|
-
:value.sync="item.f_date"
|
|
81
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
82
|
-
:show-reset-button="true">
|
|
83
|
-
</datepicker>
|
|
97
|
+
<div class="col-sm-3" style="text-align: center;">
|
|
98
|
+
<button class="button_clear button_spacing" @click="add(2)">＋</button>
|
|
99
|
+
<button class="button_clear button_spacing" @click="remove(2)">一</button>
|
|
100
|
+
<button class="button_search button_spacing" @click="redactSave(2)">保存</button>
|
|
84
101
|
</div>
|
|
85
102
|
</div>
|
|
86
|
-
<div class="row" style="text-align: right">
|
|
87
|
-
<button class="button_clear button_spacing" @click="add(2)">＋</button>
|
|
88
|
-
<button class="button_clear button_spacing" @click="remove(2)">一</button>
|
|
89
|
-
<button class="button_search button_spacing" @click="redactSave(2)">保存</button>
|
|
90
103
|
</div>
|
|
104
|
+
|
|
91
105
|
</div>
|
|
92
106
|
</template>
|
|
93
107
|
|
|
@@ -7,11 +7,11 @@
|
|
|
7
7
|
<table>
|
|
8
8
|
<tr>
|
|
9
9
|
<td class="td1"><img src="../../../static/NewManageHome/sell_1.png" style="width: 29px"></td>
|
|
10
|
-
<td><nobr><span>当年总售气量</span></nobr><br/> <nobr><span class="s1">{{ resdata1 }}
|
|
10
|
+
<td><nobr><span>当年总售气量</span></nobr><br/> <nobr><span class="s1">{{ resdata1 > 10000 ? (resdata1/10000).toFixed(0) + '万' : resdata1 }}</span></nobr></td>
|
|
11
11
|
</tr>
|
|
12
12
|
<tr>
|
|
13
13
|
<td class="td1"><img src="../../../static/NewManageHome/sell_2.png" style="width: 27px"></td>
|
|
14
|
-
<td><nobr><span>上月总售气量<br/></span></nobr> <span class="s2">{{ resdata }}
|
|
14
|
+
<td><nobr><span>上月总售气量<br/></span></nobr> <span class="s2">{{resdata > 10000 ? (resdata/10000).toFixed(0) + '万' : resdata}}</span></td>
|
|
15
15
|
</tr>
|
|
16
16
|
</table>
|
|
17
17
|
</div>
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
</div>
|
|
60
60
|
</div>
|
|
61
61
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
62
|
-
<res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
62
|
+
<res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
63
63
|
<div class="col-sm-2 form-group">
|
|
64
64
|
<label class="font_normal_body">收费编号</label>
|
|
65
65
|
<input type="text" style="width:60%" class="input_search" v-model="model.id"
|
|
@@ -99,6 +99,13 @@
|
|
|
99
99
|
condition="f_state = '{}'"
|
|
100
100
|
close-on-select></v-select>
|
|
101
101
|
</div>
|
|
102
|
+
<div class="col-sm-2 form-group">
|
|
103
|
+
<label class="font_normal_body">用户类型</label>
|
|
104
|
+
<v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
|
|
105
|
+
:options='$parent.$parent.usertypes' placeholder='请选择'
|
|
106
|
+
condition="f_user_type = '{}'"
|
|
107
|
+
close-on-select></v-select>
|
|
108
|
+
</div>
|
|
102
109
|
</div>
|
|
103
110
|
|
|
104
111
|
</div>
|
|
@@ -113,6 +120,9 @@
|
|
|
113
120
|
<th>
|
|
114
121
|
<nobr>客户名称</nobr>
|
|
115
122
|
</th>
|
|
123
|
+
<th>
|
|
124
|
+
<nobr>客户类型</nobr>
|
|
125
|
+
</th>
|
|
116
126
|
<th>
|
|
117
127
|
<nobr>客户电话</nobr>
|
|
118
128
|
</th>
|
|
@@ -160,6 +170,9 @@
|
|
|
160
170
|
<td style="text-align: center;">
|
|
161
171
|
<nobr>{{row.f_user_name}}</nobr>
|
|
162
172
|
</td>
|
|
173
|
+
<td style="text-align: center;">
|
|
174
|
+
<nobr>{{row.f_user_type}}</nobr>
|
|
175
|
+
</td>
|
|
163
176
|
<td style="text-align: center;">
|
|
164
177
|
<nobr>{{row.f_user_phone}}</nobr>
|
|
165
178
|
</td>
|
|
@@ -451,6 +464,9 @@
|
|
|
451
464
|
},
|
|
452
465
|
chargeState() {
|
|
453
466
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('补气状态')]
|
|
467
|
+
},
|
|
468
|
+
usertypes() {
|
|
469
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
454
470
|
}
|
|
455
471
|
}
|
|
456
472
|
}
|
|
@@ -328,7 +328,7 @@ export default{
|
|
|
328
328
|
'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话','f_transfer_fees': '过户费','f_operate_date': '过户日期'
|
|
329
329
|
},
|
|
330
330
|
fillgasConfig: {
|
|
331
|
-
'f_userinfo_code': '客户编号','f_user_name': '客户名称',
|
|
331
|
+
'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_user_type': '客户类型', 'f_user_phone': '客户电话', 'f_address': '客户地址',
|
|
332
332
|
'f_card_id': '卡号','f_meter_brand': '气表品牌','f_type': '补气类型','f_comments': '补气原因',
|
|
333
333
|
'f_pregas': '补气量','f_preamount': '补气金额','f_operate_date': '补气日期',
|
|
334
334
|
'f_operator': '操作员','f_depname': '部门','f_orgname': '公司'
|
|
@@ -182,6 +182,21 @@
|
|
|
182
182
|
<th style="text-align:center"><nobr>指令生成时间</nobr></th>
|
|
183
183
|
<th style="text-align:center"><nobr>指令发送时间</nobr></th>
|
|
184
184
|
<th style="text-align:center"><nobr>上表时间</nobr></th>
|
|
185
|
+
<th style="text-align:center">
|
|
186
|
+
<nobr>操作内容</nobr>
|
|
187
|
+
</th>
|
|
188
|
+
<th style="text-align:center">
|
|
189
|
+
<nobr>操作人(记录)</nobr>
|
|
190
|
+
</th>
|
|
191
|
+
<th style="text-align:center">
|
|
192
|
+
<nobr>操作时间(记录)</nobr>
|
|
193
|
+
</th>
|
|
194
|
+
<th style="text-align:center">
|
|
195
|
+
<nobr>操作类型</nobr>
|
|
196
|
+
</th>
|
|
197
|
+
<th style="text-align:center">
|
|
198
|
+
<nobr>记录状态</nobr>
|
|
199
|
+
</th>
|
|
185
200
|
<th style="text-align:center"><nobr>组织机构</nobr></th>
|
|
186
201
|
</tr>
|
|
187
202
|
</template>
|
|
@@ -226,6 +241,21 @@
|
|
|
226
241
|
</td>
|
|
227
242
|
<td style="text-align:center"><nobr>{{row.f_send_date}}</nobr></td>
|
|
228
243
|
<td style="text-align:center"><nobr>{{row.f_callback_date}}</nobr></td>
|
|
244
|
+
<td style="text-align:center">
|
|
245
|
+
<nobr>{{row.note}}</nobr>
|
|
246
|
+
</td>
|
|
247
|
+
<td style="text-align:center">
|
|
248
|
+
<nobr>{{row.f_operator}}</nobr>
|
|
249
|
+
</td>
|
|
250
|
+
<td style="text-align:center">
|
|
251
|
+
<nobr>{{row.f_operate_date}}</nobr>
|
|
252
|
+
</td>
|
|
253
|
+
<td style="text-align:center">
|
|
254
|
+
<nobr>{{row.f_operate_type}}</nobr>
|
|
255
|
+
</td>
|
|
256
|
+
<td style="text-align:center">
|
|
257
|
+
<nobr>{{row.f_state}}</nobr>
|
|
258
|
+
</td>
|
|
229
259
|
<td style="text-align:center">
|
|
230
260
|
<nobr>{{row.f_orgname}}</nobr>
|
|
231
261
|
</td>
|
|
@@ -282,7 +312,8 @@
|
|
|
282
312
|
'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
|
|
283
313
|
'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_type': '指令类型',
|
|
284
314
|
'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_inputtor': '指令生成人','f_instruct_date': '指令时间',
|
|
285
|
-
'
|
|
315
|
+
'note':'操作内容','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
|
|
316
|
+
'f_orgname': '组织机构'
|
|
286
317
|
}
|
|
287
318
|
},
|
|
288
319
|
}
|
|
@@ -361,13 +392,31 @@
|
|
|
361
392
|
val.model = this.model.model
|
|
362
393
|
this.$emit('deal-msg', val)
|
|
363
394
|
},
|
|
364
|
-
search (args) {
|
|
395
|
+
async search (args) {
|
|
365
396
|
// this.obj.resids = this.obj.resids.replace(/\./g, ''),
|
|
366
397
|
args.condition = `${args.condition}`+this.orgcondition
|
|
367
398
|
console.log(args.condition+"args.condition")
|
|
368
399
|
this.condition = args.condition
|
|
400
|
+
if( this.$refs.paged.$refs.criteria.model.f_start_date!=null && this.$refs.paged.$refs.criteria.model.f_start_date!=''){
|
|
401
|
+
this.model.params.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
|
|
402
|
+
}else{
|
|
403
|
+
this.model.params.f_start_date = '';
|
|
404
|
+
}
|
|
405
|
+
if( this.$refs.paged.$refs.criteria.model.f_end_date!=null && this.$refs.paged.$refs.criteria.model.f_end_date!=''){
|
|
406
|
+
this.model.params.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
|
|
407
|
+
}else{
|
|
408
|
+
this.model.params.f_end_date = "";
|
|
409
|
+
}
|
|
410
|
+
if(this.f_orgid_new == '' || this.f_orgid_new == null){
|
|
411
|
+
this.model.params.f_orgid = `'${this.$login.f.orgid}'`;
|
|
412
|
+
//await this.$LoadParams.loadParam(this.$login.f.orgid)
|
|
413
|
+
}else{
|
|
414
|
+
this.model.params.f_orgid = `'${this.f_orgid_new}'`;
|
|
415
|
+
//await this.$LoadParams.loadParam(this.f_orgid_new)
|
|
416
|
+
}
|
|
369
417
|
this.model.search(args.condition, args.model)
|
|
370
|
-
|
|
418
|
+
this.initQueryParam();
|
|
419
|
+
},
|
|
371
420
|
|
|
372
421
|
},
|
|
373
422
|
computed: {
|
package/src/reportManage.js
CHANGED
|
@@ -448,6 +448,10 @@ export default function (filiale) {
|
|
|
448
448
|
Vue.component('market-month', (resolve) => {
|
|
449
449
|
require(['./components/SellReport/MarketMonth'], resolve)
|
|
450
450
|
})
|
|
451
|
+
// 财务报表(销售类型)
|
|
452
|
+
Vue.component('finance-sell-type', (resolve) => {
|
|
453
|
+
require(['./components/SellReport/FinanceSellType'], resolve)
|
|
454
|
+
})
|
|
451
455
|
if (filiale) {
|
|
452
456
|
let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
|
|
453
457
|
Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
|