manage-client 3.3.263 → 3.3.264
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 +1 -1
- package/src/components/SellReport/rongchang/RcSellData.vue +172 -0
- package/src/components/webmeter/DrillData/UserGasEform.vue +3 -1
- package/src/filiale/ancheng/businessquery/FMYGasQuery.vue +29 -1
- package/src/filiale/ancheng/exportConfig.js +4 -1
- package/src/reportManage.js +4 -0
package/package.json
CHANGED
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 100%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-2 form-group" >
|
|
8
|
+
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
9
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
10
|
+
v-model="model.startDate"
|
|
11
|
+
:value.sync="model.startDate"
|
|
12
|
+
:disabled-days-of-Week="[]"
|
|
13
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
14
|
+
:show-reset-button="reset">
|
|
15
|
+
</datepicker>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="col-sm-2 form-group" >
|
|
18
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
19
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
20
|
+
v-model="model.endDate"
|
|
21
|
+
:value.sync="model.endDate"
|
|
22
|
+
:disabled-days-of-Week="[]"
|
|
23
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
24
|
+
:show-reset-button="reset">
|
|
25
|
+
</datepicker>
|
|
26
|
+
</div>
|
|
27
|
+
<res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="span" style = "float:right;">
|
|
30
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
31
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
32
|
+
<report-excel id='gasprice'></report-excel>
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
</criteria>
|
|
36
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
37
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
38
|
+
<thead>
|
|
39
|
+
<tr>
|
|
40
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
41
|
+
<h3 style="text-align: center">气量销售报表</h3>
|
|
42
|
+
</th>
|
|
43
|
+
</tr>
|
|
44
|
+
<tr>
|
|
45
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
46
|
+
开始时间：{{model.model.startDate}}
|
|
47
|
+
结束时间：{{ model.model.endDate }} <br/>
|
|
48
|
+
<!--打印时间：{{{$parent.printTime}}}-->
|
|
49
|
+
打印时间：{{$parent.printTime}}
|
|
50
|
+
<!--收费员：{{// $parent.operatorname}}-->
|
|
51
|
+
</th>
|
|
52
|
+
</tr>
|
|
53
|
+
<tr>
|
|
54
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
55
|
+
<div>
|
|
56
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
57
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
58
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
|
|
59
|
+
</div>
|
|
60
|
+
</th>
|
|
61
|
+
</tr>
|
|
62
|
+
</thead>
|
|
63
|
+
<tr>
|
|
64
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
65
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
66
|
+
</td>
|
|
67
|
+
</tr>
|
|
68
|
+
<tfoot>
|
|
69
|
+
<tr style="text-align: left">
|
|
70
|
+
<th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
|
|
71
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
|
|
72
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
|
|
73
|
+
</tr>
|
|
74
|
+
</tfoot>
|
|
75
|
+
</table>
|
|
76
|
+
{{{ $parent.reportStr}}}
|
|
77
|
+
</div>
|
|
78
|
+
</criteria-paged>
|
|
79
|
+
</div>
|
|
80
|
+
</template>
|
|
81
|
+
|
|
82
|
+
<script>
|
|
83
|
+
import { DataModel } from 'vue-client'
|
|
84
|
+
import co from 'co'
|
|
85
|
+
|
|
86
|
+
export default {
|
|
87
|
+
title: '气量销售报表',
|
|
88
|
+
props: ['data'],
|
|
89
|
+
data () {
|
|
90
|
+
return {
|
|
91
|
+
printTime: this.$login.toStandardTimeString(),
|
|
92
|
+
depresid: [],
|
|
93
|
+
userresid: [],
|
|
94
|
+
f_orgid: this.$login.f.orgid,
|
|
95
|
+
f_depid: this.$login.f.depids,
|
|
96
|
+
// f_operatorid: this.$login.f.id,
|
|
97
|
+
operatorid: [],
|
|
98
|
+
depid: [],
|
|
99
|
+
orgname: '',
|
|
100
|
+
depname: '',
|
|
101
|
+
criteriaShow: false,
|
|
102
|
+
operatorname: '',
|
|
103
|
+
orgCondtionStr: '1=1',
|
|
104
|
+
model: new DataModel('api/af-revenue/report/rc_sell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
105
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
106
|
+
reportStr: null,
|
|
107
|
+
resshow:['company','department','operator'],
|
|
108
|
+
spans: 0,
|
|
109
|
+
initres: {
|
|
110
|
+
org: [this.$login.f.orgid],
|
|
111
|
+
dep: [],
|
|
112
|
+
user: []
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
},
|
|
116
|
+
ready () {
|
|
117
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
118
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
119
|
+
console.log(this.$login.f)
|
|
120
|
+
},
|
|
121
|
+
methods: {
|
|
122
|
+
searchData () {
|
|
123
|
+
this.$refs.paged.$refs.criteria.search()
|
|
124
|
+
},
|
|
125
|
+
selfSearch (args) {
|
|
126
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
127
|
+
let orgcondition = '1=1'
|
|
128
|
+
let orgstr = this.orgCondtionStr
|
|
129
|
+
orgcondition = orgcondition + orgstr
|
|
130
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
131
|
+
this.$refs.paged.search(args)
|
|
132
|
+
},
|
|
133
|
+
hidden() {
|
|
134
|
+
this.criteriaShow = !this.criteriaShow
|
|
135
|
+
},
|
|
136
|
+
getRes (condition, obj) {
|
|
137
|
+
this.orgCondtionStr = condition
|
|
138
|
+
this.orgname = obj.orgnames[0]
|
|
139
|
+
this.depname = obj.depnames[0]
|
|
140
|
+
this.operatorname = obj.operatornames[0]
|
|
141
|
+
},
|
|
142
|
+
getdep (obj, val) {
|
|
143
|
+
this.depname = val[0]
|
|
144
|
+
this.userresid = obj
|
|
145
|
+
this.f_depid = obj
|
|
146
|
+
},
|
|
147
|
+
getuser ( obj, val) {
|
|
148
|
+
this.operatorname = val[0]
|
|
149
|
+
this.f_operatorid = obj
|
|
150
|
+
}
|
|
151
|
+
},
|
|
152
|
+
watch: {
|
|
153
|
+
'model.data' (val) {
|
|
154
|
+
let len=0
|
|
155
|
+
let a=val.split('</tr>')
|
|
156
|
+
for(let i=0;i<a.length;i++){
|
|
157
|
+
if(a[i].split('</td>').length-1>len){
|
|
158
|
+
len=a[i].split('</td>').length-1
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
this.spans = len
|
|
162
|
+
}
|
|
163
|
+
},
|
|
164
|
+
computed: {
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
</script>
|
|
168
|
+
<style scoped>
|
|
169
|
+
.noborder{
|
|
170
|
+
border: none;
|
|
171
|
+
}
|
|
172
|
+
</style>
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
<button @click="$parent.notShowTotalForm()" class="button_clear button_spacing" style="width: max-content">隐藏汇总</button>
|
|
44
44
|
<export-excel :data="getCondition" class="button_export button_spacing"
|
|
45
45
|
:field="getfield"
|
|
46
|
-
sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getUserGasSum" template-name='
|
|
46
|
+
sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getUserGasSum" template-name='未用气分析汇总'
|
|
47
47
|
:choose-col="true"></export-excel>
|
|
48
48
|
|
|
49
49
|
<!--<rexport-excel class="button_export button_spacing" id="table" style="width: 28%"></rexport-excel>-->
|
|
@@ -193,6 +193,8 @@
|
|
|
193
193
|
getCondition() {
|
|
194
194
|
return {
|
|
195
195
|
condition: this.conditionForSql,
|
|
196
|
+
startDate: this.startdate,
|
|
197
|
+
endDate: this.enddate,
|
|
196
198
|
groupname: this.groupNameForSql
|
|
197
199
|
|
|
198
200
|
}
|
|
@@ -283,6 +283,17 @@
|
|
|
283
283
|
<th>
|
|
284
284
|
<nobr>用气金额</nobr>
|
|
285
285
|
</th>
|
|
286
|
+
<template v-if = "$parent.$parent.$parent.titleShow">
|
|
287
|
+
<th>
|
|
288
|
+
<nobr>法人单位名称</nobr>
|
|
289
|
+
</th>
|
|
290
|
+
<th>
|
|
291
|
+
<nobr>统一社会信用代码</nobr>
|
|
292
|
+
</th>
|
|
293
|
+
</template>
|
|
294
|
+
<th>
|
|
295
|
+
<nobr>缴费时间</nobr>
|
|
296
|
+
</th>
|
|
286
297
|
<th>
|
|
287
298
|
<nobr>建档日期</nobr>
|
|
288
299
|
</th>
|
|
@@ -376,6 +387,17 @@
|
|
|
376
387
|
<td style="text-align: center;">
|
|
377
388
|
<nobr>{{row.f_oughtfee}}</nobr>
|
|
378
389
|
</td>
|
|
390
|
+
<template v-if = "$parent.$parent.$parent.titleShow">
|
|
391
|
+
<td style="text-align: center;">
|
|
392
|
+
<nobr>{{row.f_paper_name}}</nobr>
|
|
393
|
+
</td>
|
|
394
|
+
<td style="text-align: center;">
|
|
395
|
+
<nobr>{{row.f_taxpayer_id}}</nobr>
|
|
396
|
+
</td>
|
|
397
|
+
</template>
|
|
398
|
+
<td style="text-align: center;">
|
|
399
|
+
<nobr>{{row.f_operate_date}}</nobr>
|
|
400
|
+
</td>
|
|
379
401
|
<td style="text-align: center;">
|
|
380
402
|
<nobr>{{row.f_createfile_date}}</nobr>
|
|
381
403
|
</td>
|
|
@@ -442,6 +464,7 @@ import exportConfig from './../exportConfig'
|
|
|
442
464
|
name: 'AddMaterial',
|
|
443
465
|
data () {
|
|
444
466
|
return {
|
|
467
|
+
titleShow: true,
|
|
445
468
|
other: [],
|
|
446
469
|
footer: [],
|
|
447
470
|
model: new PagedList('api/af-revenue/sql/FMYgasQuery', 30, {
|
|
@@ -495,6 +518,9 @@ import exportConfig from './../exportConfig'
|
|
|
495
518
|
},
|
|
496
519
|
ready () {
|
|
497
520
|
readySomething(this)
|
|
521
|
+
console.log('===========510')
|
|
522
|
+
console.log(this.titleShow)
|
|
523
|
+
console.log('===========510')
|
|
498
524
|
},
|
|
499
525
|
methods: {
|
|
500
526
|
initParams(){
|
|
@@ -644,7 +670,7 @@ import exportConfig from './../exportConfig'
|
|
|
644
670
|
} else {
|
|
645
671
|
this.gasproperties = [{label: '全部', value: ''}]
|
|
646
672
|
}
|
|
647
|
-
|
|
673
|
+
`` },
|
|
648
674
|
search () {
|
|
649
675
|
this.$refs.paged.$refs.cri.search()
|
|
650
676
|
},
|
|
@@ -652,9 +678,11 @@ import exportConfig from './../exportConfig'
|
|
|
652
678
|
this.show = false
|
|
653
679
|
},
|
|
654
680
|
selfSearch (args) {
|
|
681
|
+
|
|
655
682
|
args.condition = `${args.condition} ` + this.orgCondtionStr
|
|
656
683
|
let con = '1=1'
|
|
657
684
|
let mod =this.$refs.paged.$refs.cri.model
|
|
685
|
+
this.titleShow = mod.f_user_type[0]!=='民用'
|
|
658
686
|
if(mod.startDate != null && mod.startDate != '') {
|
|
659
687
|
con += ` and f_input_date >= '${mod.startDate}'`
|
|
660
688
|
}
|
|
@@ -426,7 +426,10 @@ export default{
|
|
|
426
426
|
'f_date': '抄表区间',
|
|
427
427
|
'f_input_day': '天数',
|
|
428
428
|
'f_oughtamount': '用气量',
|
|
429
|
-
'f_oughtfee': '用气金额'
|
|
429
|
+
'f_oughtfee': '用气金额',
|
|
430
|
+
'f_paper_name': '法人单位名称',
|
|
431
|
+
'f_taxpayer_id': '统一社会信用代码',
|
|
432
|
+
'f_operate_date': '缴费时间'
|
|
430
433
|
},
|
|
431
434
|
notgasConfig: {
|
|
432
435
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',
|
package/src/reportManage.js
CHANGED
|
@@ -790,4 +790,8 @@ export default function () {
|
|
|
790
790
|
Vue.component('fg-user-gas-type', (resolve) => {
|
|
791
791
|
require(['./components/SellReport/fugou/FgUserGasType'], resolve)
|
|
792
792
|
})
|
|
793
|
+
// 报表展示组件（荣昌-气量销售报表）
|
|
794
|
+
Vue.component('rc-sell-data', (resolve) => {
|
|
795
|
+
require(['./components/SellReport/rongchang/RcSellData'], resolve)
|
|
796
|
+
})
|
|
793
797
|
}
|