manage-client 3.1.33 → 3.1.37
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 +2 -2
- package/package.json +1 -1
- package/src/components/SellReport/BusinessClassify.vue +17 -1
- package/src/components/SellReport/ChargePrick.vue +1 -1
- package/src/components/SellReport/DepartmentPrick.vue +1 -2
- package/src/components/SellReport/GasPrice.vue +1 -1
- package/src/components/SellReport/ManageBusSummary.vue +19 -10
- package/src/components/SellReport/ManageHandInputtor.vue +1 -1
- package/src/components/SellReport/ManageOtherCharge.vue +250 -250
- package/src/components/SellReport/ManageSellType.vue +1 -1
- package/src/components/SellReport/ManageUserCount.vue +1 -1
- package/src/components/SellReport/SaleMonthReport.vue +227 -227
- package/src/components/SellReport/UserClassify.vue +1 -1
- package/src/components/sale/businessquery/BusinessManage.vue +3 -0
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +15 -5
- package/src/components/sale/businessquery/FillGasQuery.vue +19 -1
- package/src/components/sale/businessquery/InfoOperateRecord.vue +291 -0
- package/src/components/webmeter/DrillData/UserGasAll.vue +3 -2
- package/src/components/webmeter/newwebmeter/NewException/NewEchartsAll.vue +1 -1
- package/src/components/webmeter/newwebmeter/NewException/NewExceptionEcharsTotal.vue +8 -4
- package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue +3 -2
- package/src/components/webmeter/newwebmeter/UserGasEchartsList.vue +2 -36
- package/src/components/webmeter/newwebmeter/UserGasList.vue +2 -4
- package/src/components/webmeter/newwebmeter/UserInstructList.vue +1 -1
- package/src/filiale/alashan/SellingTable.vue +10 -7
- package/src/filiale/tongchuan/FillGasQuery.vue +508 -0
- package/src/filiale/tongchuan/sale.js +2 -1
- package/src/saleManage.js +2 -0
|
@@ -0,0 +1,291 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<div class="basic-main" @keyup.enter="search">
|
|
4
|
+
<div class="flex">
|
|
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
|
+
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
11
|
+
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
12
|
+
v-model="model.startDate"
|
|
13
|
+
:value.sync="model.startDate"
|
|
14
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
15
|
+
:show-reset-button="true"
|
|
16
|
+
condition="modifitime >= '{}'">
|
|
17
|
+
</datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group">
|
|
20
|
+
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
21
|
+
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
22
|
+
v-model="model.endDate"
|
|
23
|
+
:value.sync="model.endDate"
|
|
24
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
25
|
+
:show-reset-button="true"
|
|
26
|
+
condition="modifitime <= '{}'">
|
|
27
|
+
</datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-2 form-group">
|
|
30
|
+
<label class="font_normal_body">维护类型</label>
|
|
31
|
+
<v-select :value.sync="model.changetype"
|
|
32
|
+
:options='$parent.$parent.changetype'
|
|
33
|
+
placeholder='请选择' v-model="model.changetype"
|
|
34
|
+
condition="changetype = '{}'"
|
|
35
|
+
close-on-select></v-select>
|
|
36
|
+
</div>
|
|
37
|
+
|
|
38
|
+
<div class="span" style="float:right;">
|
|
39
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
40
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
41
|
+
|
|
42
|
+
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
43
|
+
</div>
|
|
44
|
+
</div>
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
49
|
+
<res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showComponent" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
</div>
|
|
54
|
+
</div>
|
|
55
|
+
</criteria>
|
|
56
|
+
|
|
57
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
58
|
+
<template partial='head'>
|
|
59
|
+
<tr>
|
|
60
|
+
<th>
|
|
61
|
+
<nobr>维护类型</nobr>
|
|
62
|
+
</th>
|
|
63
|
+
<th>
|
|
64
|
+
<nobr>记录id</nobr>
|
|
65
|
+
</th>
|
|
66
|
+
<th>
|
|
67
|
+
<nobr>维护字段</nobr>
|
|
68
|
+
</th>
|
|
69
|
+
<th>
|
|
70
|
+
<nobr>字段含义</nobr>
|
|
71
|
+
</th>
|
|
72
|
+
<th>
|
|
73
|
+
<nobr>修改前内容</nobr>
|
|
74
|
+
</th>
|
|
75
|
+
<th>
|
|
76
|
+
<nobr>修改后内容</nobr>
|
|
77
|
+
</th>
|
|
78
|
+
<th>
|
|
79
|
+
<nobr>修改时间</nobr>
|
|
80
|
+
</th>
|
|
81
|
+
<th>
|
|
82
|
+
<nobr>修改人</nobr>
|
|
83
|
+
</th>
|
|
84
|
+
</tr>
|
|
85
|
+
</template>
|
|
86
|
+
<template partial='body'>
|
|
87
|
+
<td style="text-align: center;">
|
|
88
|
+
<nobr>{{row.changetype}}</nobr>
|
|
89
|
+
</td>
|
|
90
|
+
<td style="text-align: center;">
|
|
91
|
+
<nobr>{{row.changeid}}</nobr>
|
|
92
|
+
</td>
|
|
93
|
+
<td style="text-align: center;">
|
|
94
|
+
<nobr>{{row.fieldname}}</nobr>
|
|
95
|
+
</td>
|
|
96
|
+
<td style="text-align: center;">
|
|
97
|
+
<nobr>{{row.chinesename}}</nobr>
|
|
98
|
+
</td>
|
|
99
|
+
<td style="text-align: center;">
|
|
100
|
+
<nobr>{{row.oldvalue}}</nobr>
|
|
101
|
+
</td>
|
|
102
|
+
<td style="text-align: center;">
|
|
103
|
+
<nobr>{{row.newvalue}}</nobr>
|
|
104
|
+
</td>
|
|
105
|
+
<td style="text-align: center;">
|
|
106
|
+
<nobr>{{row.modifitime}}</nobr>
|
|
107
|
+
</td>
|
|
108
|
+
<td style="text-align: center;">
|
|
109
|
+
<nobr>{{row.operator}}</nobr>
|
|
110
|
+
</td>
|
|
111
|
+
</template>
|
|
112
|
+
<template partial='foot'></template>
|
|
113
|
+
</data-grid>
|
|
114
|
+
</criteria-paged>
|
|
115
|
+
</div>
|
|
116
|
+
</div>
|
|
117
|
+
</div>
|
|
118
|
+
<modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
|
|
119
|
+
<article slot="modal-body">
|
|
120
|
+
<upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false" fusetype="批量调价" :isremark="false" style="width:auto" ></upload>
|
|
121
|
+
</article>
|
|
122
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
123
|
+
</footer>
|
|
124
|
+
</modal>
|
|
125
|
+
</template>
|
|
126
|
+
|
|
127
|
+
<script>
|
|
128
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
129
|
+
import exportConfig from '../config/exportConfig'
|
|
130
|
+
import defaultPrint from '../config/DefaultPrint'
|
|
131
|
+
|
|
132
|
+
let readySomething = async function (self) {
|
|
133
|
+
self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
|
|
134
|
+
self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
|
|
135
|
+
// self.$refs.paged.$refs.cri.model.operateDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
136
|
+
// self.$refs.paged.$refs.cri.model.performDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
137
|
+
await self.$MagLoadParams.loadParam()
|
|
138
|
+
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
139
|
+
self.initParams()
|
|
140
|
+
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
|
|
141
|
+
}
|
|
142
|
+
export default {
|
|
143
|
+
props:['data'],
|
|
144
|
+
title: '调价记录查询',
|
|
145
|
+
data() {
|
|
146
|
+
return {
|
|
147
|
+
other:[],
|
|
148
|
+
footer:[],
|
|
149
|
+
config: {
|
|
150
|
+
defaultPrint: ['f_userinfo_code', 'f_user_name','f_address', 'f_user_type', 'f_gasproperties','f_oldprice','f_newprice','oldprice_performdate','newprice_performdate','f_operate_date','f_operator','f_depname']
|
|
151
|
+
},
|
|
152
|
+
//f_price_name:[],
|
|
153
|
+
gasproperties:[],
|
|
154
|
+
data: {},
|
|
155
|
+
initres: {
|
|
156
|
+
org:[this.$login.f.orgid],
|
|
157
|
+
dep:[],
|
|
158
|
+
user:[]
|
|
159
|
+
},
|
|
160
|
+
showComponent:['company','department','operator'],
|
|
161
|
+
model: new PagedList('rs/sql/infoOperateRecordQuery', 20, {}, ),
|
|
162
|
+
criteriaShow: false,
|
|
163
|
+
orgCondtionStr: '',
|
|
164
|
+
// 下拉框
|
|
165
|
+
meterbrands: [],
|
|
166
|
+
//合计数据
|
|
167
|
+
defaultfield: [],
|
|
168
|
+
sumsmodel: {},
|
|
169
|
+
showupload:false,
|
|
170
|
+
selected:{},
|
|
171
|
+
f_filialeid: this.$login.f.f_orgid,
|
|
172
|
+
changetype: [{'label':'全部','value':''},{'label':'换表记录维护','value':'换表记录维护'},
|
|
173
|
+
{'label':'票据记录维护','value':'票据记录维护'},{'label':'其他收费记录维护','value':'其他收费记录维护'},
|
|
174
|
+
{'label':'补气记录维护','value':'补气记录维护'},{'label':'收费记录维护','value':'收费记录维护'},
|
|
175
|
+
{'label':'补卡记录维护','value':'补卡记录维护'},{'label':'抄表记录维护','value':'抄表记录维护'}]
|
|
176
|
+
}
|
|
177
|
+
},
|
|
178
|
+
ready() {
|
|
179
|
+
readySomething(this).then(() => {
|
|
180
|
+
this.$emit('ready')
|
|
181
|
+
}).catch((error) => {
|
|
182
|
+
this.$emit('error', error)
|
|
183
|
+
})
|
|
184
|
+
|
|
185
|
+
},
|
|
186
|
+
methods: {
|
|
187
|
+
view(row){
|
|
188
|
+
this.showupload = true
|
|
189
|
+
this.selected= row
|
|
190
|
+
},
|
|
191
|
+
initParams() {
|
|
192
|
+
// 初始化气表品牌
|
|
193
|
+
let brandArr = []
|
|
194
|
+
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
195
|
+
let temp = {}
|
|
196
|
+
temp.label = item.label
|
|
197
|
+
temp.value = item.value.f_meter_brand
|
|
198
|
+
brandArr.push(temp)
|
|
199
|
+
})
|
|
200
|
+
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
201
|
+
},
|
|
202
|
+
|
|
203
|
+
search(){
|
|
204
|
+
this.$refs.paged.$refs.cri.search()
|
|
205
|
+
},
|
|
206
|
+
|
|
207
|
+
|
|
208
|
+
selfSearch(args) {
|
|
209
|
+
//小区查询条件
|
|
210
|
+
if (this.data) {
|
|
211
|
+
this.$parent.$parent.$parent.data.operateDate=this.$refs.paged.$refs.cri.model.operateDate
|
|
212
|
+
this.$parent.$parent.$parent.data.performDate=this.$refs.paged.$refs.cri.model.performDate
|
|
213
|
+
}
|
|
214
|
+
let f_orgstr = this.orgCondtionStr
|
|
215
|
+
args.condition = `${args.condition} ` + f_orgstr
|
|
216
|
+
this.model.search(args.condition, args.model)
|
|
217
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
218
|
+
|
|
219
|
+
},
|
|
220
|
+
clear() {
|
|
221
|
+
console.log('---------aaaa')
|
|
222
|
+
//清空部门和人员
|
|
223
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
|
|
224
|
+
//部门和人员变为全选
|
|
225
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
|
|
226
|
+
this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
|
|
227
|
+
Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
|
|
228
|
+
this.$refs.paged.$refs.cri.model[key] = []
|
|
229
|
+
})
|
|
230
|
+
|
|
231
|
+
},
|
|
232
|
+
dealmsg(val) {
|
|
233
|
+
val.model = this.model.model
|
|
234
|
+
this.$dispatch('deal-msg', val)
|
|
235
|
+
},
|
|
236
|
+
show() {
|
|
237
|
+
this.criteriaShow = true
|
|
238
|
+
},
|
|
239
|
+
hidden() {
|
|
240
|
+
this.criteriaShow = !this.criteriaShow
|
|
241
|
+
},
|
|
242
|
+
getRes(condition,obj) {
|
|
243
|
+
this.orgCondtionStr = condition
|
|
244
|
+
this.orgname = obj.orgnames[0]
|
|
245
|
+
this.depname = obj.depnames[0]
|
|
246
|
+
},
|
|
247
|
+
userTypeChange () {
|
|
248
|
+
this.gasproperties=[]
|
|
249
|
+
if(this.$refs.paged.$refs.cri.model !==null) {
|
|
250
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties=''
|
|
251
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
252
|
+
}
|
|
253
|
+
else{
|
|
254
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
255
|
+
}
|
|
256
|
+
},
|
|
257
|
+
|
|
258
|
+
},
|
|
259
|
+
events:{
|
|
260
|
+
|
|
261
|
+
},
|
|
262
|
+
watch: {
|
|
263
|
+
|
|
264
|
+
'orgCondtionStr'(val) {
|
|
265
|
+
let res = val.match(/'(.*?)'/)
|
|
266
|
+
console.log('正则提取:',res && res[1])
|
|
267
|
+
if (res) {
|
|
268
|
+
this.f_filialeid = res[1]
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
},
|
|
272
|
+
computed: {
|
|
273
|
+
|
|
274
|
+
getCondition() {
|
|
275
|
+
return {
|
|
276
|
+
operateDate: this.$refs.paged.$refs.cri.model.operateDate,
|
|
277
|
+
performDate: this.$refs.paged.$refs.cri.model.performDate,
|
|
278
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
|
|
279
|
+
},
|
|
280
|
+
getfield() {
|
|
281
|
+
return exportConfig.pricechangeRecordConfig
|
|
282
|
+
},
|
|
283
|
+
metertypes() {
|
|
284
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
285
|
+
},
|
|
286
|
+
usertypes() {
|
|
287
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
288
|
+
},
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
</script>
|
|
@@ -414,7 +414,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
414
414
|
|
|
415
415
|
}
|
|
416
416
|
},
|
|
417
|
-
groupname: ['
|
|
417
|
+
groupname: ['day'],
|
|
418
418
|
getgroupname: [
|
|
419
419
|
{label: '年份', value: 'year'},
|
|
420
420
|
{label: '月份', value: 'month'},
|
|
@@ -429,7 +429,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
429
429
|
},
|
|
430
430
|
ready() {
|
|
431
431
|
readyGen(this)
|
|
432
|
-
|
|
432
|
+
console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
|
|
433
|
+
this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
|
|
433
434
|
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
434
435
|
this.$refs.paged.$refs.cri.search()
|
|
435
436
|
this.getfield = this.config.excelHeaders
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template lang="html">
|
|
2
2
|
|
|
3
3
|
<div class="basic-main">
|
|
4
|
-
<div style="height:
|
|
4
|
+
<div style="height: 20%;width: 100%;" v-show="echarts">
|
|
5
5
|
<div style="display: inline-block;">
|
|
6
6
|
<button @click="$parent.notShowEcharts()" class="button_clear button_spacing">隐藏图表</button>
|
|
7
7
|
</div>
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
value-single="true"></v-select>
|
|
17
17
|
</div>
|
|
18
18
|
</div>
|
|
19
|
-
<div id="charts" style=" height:
|
|
20
|
-
<div id="exception" style=" height: 600px;width: 800px;
|
|
19
|
+
<div id="charts" style=" height: 80%;width: 98%;">
|
|
20
|
+
<div id="exception" style=" height: 600px;width: 800px;"></div>
|
|
21
21
|
</div>
|
|
22
22
|
</div>
|
|
23
23
|
</template>
|
|
@@ -233,7 +233,11 @@
|
|
|
233
233
|
},
|
|
234
234
|
'legend': {
|
|
235
235
|
'data': type,
|
|
236
|
-
|
|
236
|
+
type: 'scroll',
|
|
237
|
+
orient: 'vertical',
|
|
238
|
+
left: 10,
|
|
239
|
+
top: 20,
|
|
240
|
+
bottom: 20,
|
|
237
241
|
'textStyle': {
|
|
238
242
|
'color': '#fff'
|
|
239
243
|
}
|
|
@@ -337,7 +337,7 @@
|
|
|
337
337
|
],
|
|
338
338
|
styles:false,
|
|
339
339
|
f_error_type:'',
|
|
340
|
-
groupname: ['
|
|
340
|
+
groupname: ['day'],
|
|
341
341
|
getgroupname: [
|
|
342
342
|
{label: '年份', value: 'year'},
|
|
343
343
|
{label: '月份', value: 'month'},
|
|
@@ -373,7 +373,8 @@
|
|
|
373
373
|
},
|
|
374
374
|
ready() {
|
|
375
375
|
readySomething(this)
|
|
376
|
-
this.$refs.paged.$refs.cri.model.startDate = Util.
|
|
376
|
+
this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
|
|
377
|
+
// this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
|
|
377
378
|
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
378
379
|
// console.log("type:"+this.$refs.paged.$refs.cri.model.f_error_type)
|
|
379
380
|
this.getErrorInfo('f_error_level')
|
|
@@ -88,15 +88,7 @@
|
|
|
88
88
|
'legend': {
|
|
89
89
|
'data': [
|
|
90
90
|
{
|
|
91
|
-
'name': '
|
|
92
|
-
'icon': 'circle',
|
|
93
|
-
'textStyle': {
|
|
94
|
-
'color': '#7d8000',
|
|
95
|
-
fontSize: 12
|
|
96
|
-
}
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
'name': '日均户均用气量(在用)(m³)',
|
|
91
|
+
'name': '日均用气量(m³)',
|
|
100
92
|
'icon': 'circle',
|
|
101
93
|
'textStyle': {
|
|
102
94
|
'color': '#7b5541',
|
|
@@ -170,33 +162,7 @@
|
|
|
170
162
|
},
|
|
171
163
|
'series': [
|
|
172
164
|
{
|
|
173
|
-
'name': '
|
|
174
|
-
nameTextStyle: {
|
|
175
|
-
fontSize: 10
|
|
176
|
-
},
|
|
177
|
-
'type': 'bar',
|
|
178
|
-
'data': f_gas,
|
|
179
|
-
'markPoint': {
|
|
180
|
-
data: [
|
|
181
|
-
{type: 'max', name: '最大值'},
|
|
182
|
-
{type: 'min', name: '最小值'}
|
|
183
|
-
]
|
|
184
|
-
},
|
|
185
|
-
markLine: {
|
|
186
|
-
data: [
|
|
187
|
-
{type: 'average', name: '平均值'}
|
|
188
|
-
]
|
|
189
|
-
},
|
|
190
|
-
'itemStyle': {
|
|
191
|
-
'normal': {
|
|
192
|
-
'color': '#7d8000'
|
|
193
|
-
}
|
|
194
|
-
},
|
|
195
|
-
'barWidth': 'auto',
|
|
196
|
-
'barGap': '0'
|
|
197
|
-
},
|
|
198
|
-
{
|
|
199
|
-
'name': '日均户均用气量(在用)(m³)',
|
|
165
|
+
'name': '日均用气量(m³)',
|
|
200
166
|
nameTextStyle: {
|
|
201
167
|
fontSize: 10
|
|
202
168
|
},
|
|
@@ -168,8 +168,7 @@
|
|
|
168
168
|
<th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>
|
|
169
169
|
<th style="text-align:center"><nobr>抄表成功户数</nobr></th>
|
|
170
170
|
<th style="text-align:center"><nobr>总用气量</nobr></th>
|
|
171
|
-
<th style="text-align:center" title="
|
|
172
|
-
<th style="text-align:center" title="日均户均用气量=总用气量/在用户数"><nobr>日均户均用气量(在用)</nobr></th>
|
|
171
|
+
<th style="text-align:center" title="日均用气量=总用气量/在用户数"><nobr>日均用气量</nobr></th>
|
|
173
172
|
<!--<th style="text-align:center"><nobr>指令成功户数</nobr></th>-->
|
|
174
173
|
<th style="text-align:center" title="抄表成功率=抄表成功户数/在用户数"><nobr>抄表成功率</nobr></th>
|
|
175
174
|
<!--<th style="text-align:center" title="指令成功率=指令成功户数/抄表成功户数"><nobr>指令成功率</nobr></th>-->
|
|
@@ -189,7 +188,6 @@
|
|
|
189
188
|
<!--<td style="text-align:center"><nobr>{{row.f_gas}}</nobr></td>-->
|
|
190
189
|
<td style="text-align:center">{{row.c1}}</td>
|
|
191
190
|
<td style="text-align:center">{{row.f_gas_all}}</td>
|
|
192
|
-
<td style="text-align:center">{{row.f_gas}}</td>
|
|
193
191
|
<td style="text-align:center">{{row.f_gas1}}</td>
|
|
194
192
|
<td style="text-align:center">{{row.f_bv1}}%</td>
|
|
195
193
|
<!--<td style="text-align:center">{{row.f_bv2}}%</td>-->
|
|
@@ -264,7 +262,7 @@
|
|
|
264
262
|
}
|
|
265
263
|
},
|
|
266
264
|
ready () {
|
|
267
|
-
this.$refs.paged.$refs.cri.model.startDate = Util.
|
|
265
|
+
this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
|
|
268
266
|
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
269
267
|
this.getMeterTypeAndBrand('f_meter_brand', '1=1')
|
|
270
268
|
this.$refs.paged.$refs.cri.search()
|
|
@@ -218,7 +218,7 @@
|
|
|
218
218
|
}
|
|
219
219
|
},
|
|
220
220
|
ready() {
|
|
221
|
-
this.$refs.paged.$refs.cri.model.startDate = Util.
|
|
221
|
+
this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
|
|
222
222
|
this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
223
223
|
this.getdata()
|
|
224
224
|
},
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
<thead>
|
|
49
49
|
<tr>
|
|
50
50
|
<th colspan='6' style="font-weight: normal; text-align: left;">
|
|
51
|
-
<h3 style="text-align: center"
|
|
51
|
+
<h3 style="text-align: center">财务统计报表</h3>
|
|
52
52
|
</th>
|
|
53
53
|
</tr>
|
|
54
54
|
<tr>
|
|
@@ -60,9 +60,9 @@
|
|
|
60
60
|
</tr>
|
|
61
61
|
<tr>
|
|
62
62
|
<th colspan='6' style="font-weight: normal; text-align: center;">
|
|
63
|
-
<span style="font-weight: normal;" v-show="$
|
|
64
|
-
<span v-show="$
|
|
65
|
-
<span style="font-weight: normal" v-show="$
|
|
63
|
+
<span style="font-weight: normal;" v-show="$refs.criteria.$refs.res_select.obj.orgnames[0]">公司：{{$parent.orgname}}</span>
|
|
64
|
+
<span v-show="$refs.criteria.$refs.res_select.obj.depnames[0]"> 部门：{{$parent.depname}}</span>
|
|
65
|
+
<span style="font-weight: normal" v-show="$refs.criteria.$refs.res_select.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
|
|
66
66
|
</th>
|
|
67
67
|
</tr>
|
|
68
68
|
</thead>
|
|
@@ -196,14 +196,17 @@
|
|
|
196
196
|
async getRes (condition, obj) {
|
|
197
197
|
this.orgCondtionStr = condition
|
|
198
198
|
if(obj.orgnames.length>0){
|
|
199
|
-
this.orgname = obj.orgnames
|
|
199
|
+
this.orgname = obj.orgnames.toString();
|
|
200
|
+
}
|
|
201
|
+
if(obj.depnames.length>0){
|
|
202
|
+
this.depname = obj.depnames.toString();
|
|
200
203
|
}
|
|
201
204
|
if(obj.operatornames.length>0){
|
|
202
205
|
let users = await this.$resetpost('rs/sql/manageSingleTable',
|
|
203
|
-
{data: {tablename: 't_user', condition: ` id
|
|
206
|
+
{data: {tablename: 't_user', condition: ` id in( ${obj.operatornames.toString()})`}},
|
|
204
207
|
{resolveMsg: null, rejectMsg: null});
|
|
205
208
|
if(users.data){
|
|
206
|
-
this.operatorname = users.data
|
|
209
|
+
this.operatorname = users.data.map(x => x.name).toString();
|
|
207
210
|
}
|
|
208
211
|
}
|
|
209
212
|
}
|