manage-client 3.3.30 → 3.3.32
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/shexian/SxMonthSummary.vue +176 -0
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +2 -2
- package/src/filiale/shanxian/FmyGasDeviceQuery.vue +1 -0
- package/src/filiale/shanxian/GasDeviceQuery.vue +1 -0
- package/src/filiale/shanxian/NewQueryInstruct.vue +2 -2
- package/src/reportManage.js +4 -2
package/package.json
CHANGED
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 98%">
|
|
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" >
|
|
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" >
|
|
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
|
+
<div class="col-sm-2">
|
|
28
|
+
<label class="font_normal_body"> 公司 </label>
|
|
29
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="col-sm-2">
|
|
32
|
+
<label class="font_normal_body"> 部门 </label>
|
|
33
|
+
<res-select restype='department'
|
|
34
|
+
is-mul="false"
|
|
35
|
+
@res-select="$parent.$parent.getdep"
|
|
36
|
+
:parentresid="$parent.$parent.depresid"
|
|
37
|
+
:initresid='$parent.$parent.depid'>
|
|
38
|
+
</res-select>
|
|
39
|
+
|
|
40
|
+
</div>
|
|
41
|
+
<div class="col-sm-2">
|
|
42
|
+
<label class="font_normal_body"> 人员 </label>
|
|
43
|
+
<res-select restype='user'
|
|
44
|
+
is-mul="false"
|
|
45
|
+
@res-select="$parent.$parent.getuser"
|
|
46
|
+
:parentresid="$parent.$parent.userresid"
|
|
47
|
+
:initresid='$parent.$parent.operatorid'>
|
|
48
|
+
</res-select>
|
|
49
|
+
</div>
|
|
50
|
+
</div>
|
|
51
|
+
<div class="span" style = "float:right;">
|
|
52
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
53
|
+
<report-print id='gasprice' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
54
|
+
<report-excel id='gasprice'></report-excel>
|
|
55
|
+
</div>
|
|
56
|
+
</div>
|
|
57
|
+
</criteria>
|
|
58
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
59
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
60
|
+
<thead>
|
|
61
|
+
<tr>
|
|
62
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
63
|
+
<h3 style="text-align: center">燃气营收月报表</h3>
|
|
64
|
+
</th>
|
|
65
|
+
</tr>
|
|
66
|
+
<tr>
|
|
67
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
68
|
+
开始时间：{{model.model.startDate}}
|
|
69
|
+
结束时间：{{ model.model.endDate }}
|
|
70
|
+
</th>
|
|
71
|
+
</tr>
|
|
72
|
+
<tr>
|
|
73
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
74
|
+
<div>
|
|
75
|
+
|
|
76
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
77
|
+
<span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
|
|
78
|
+
</div>
|
|
79
|
+
</th>
|
|
80
|
+
</tr>
|
|
81
|
+
</thead>
|
|
82
|
+
<tr>
|
|
83
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
84
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
85
|
+
</td>
|
|
86
|
+
</tr>
|
|
87
|
+
<!-- <tfoot>-->
|
|
88
|
+
<!-- <tr style="text-align: left">-->
|
|
89
|
+
<!-- <th :colspan='Math.floor($parent.spans/2)'>审核人:安芳芳</th>-->
|
|
90
|
+
<!-- <th :colspan='Math.floor($parent.spans/2)'>制表人:{{$parent.operatorname}}</th>-->
|
|
91
|
+
<!-- </tr>-->
|
|
92
|
+
<!-- </tfoot>-->
|
|
93
|
+
</table>
|
|
94
|
+
</div>
|
|
95
|
+
</criteria-paged>
|
|
96
|
+
</div>
|
|
97
|
+
</template>
|
|
98
|
+
|
|
99
|
+
<script>
|
|
100
|
+
import { DataModel } from 'vue-client'
|
|
101
|
+
import co from 'co'
|
|
102
|
+
export default {
|
|
103
|
+
title: '燃气营收月报表',
|
|
104
|
+
props: ['data'],
|
|
105
|
+
data () {
|
|
106
|
+
return {
|
|
107
|
+
printTime: this.$login.toStandardTimeString(),
|
|
108
|
+
depresid: [],
|
|
109
|
+
userresid: [],
|
|
110
|
+
f_orgid: this.$login.f.orgid,
|
|
111
|
+
f_depid: this.$login.f.depids,
|
|
112
|
+
f_operatorid: this.$login.f.id,
|
|
113
|
+
operatorid: [],
|
|
114
|
+
depid: [],
|
|
115
|
+
orgname: '',
|
|
116
|
+
depname: '',
|
|
117
|
+
operatorname: '',
|
|
118
|
+
orgCondtionStr: '1=1',
|
|
119
|
+
model: new DataModel('rs/report/sx_MonthSellReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
120
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
121
|
+
reportStr: null,
|
|
122
|
+
spans: 0
|
|
123
|
+
}
|
|
124
|
+
},
|
|
125
|
+
ready () {
|
|
126
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
127
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
128
|
+
},
|
|
129
|
+
methods: {
|
|
130
|
+
searchData () {
|
|
131
|
+
this.$refs.paged.$refs.criteria.search()
|
|
132
|
+
},
|
|
133
|
+
selfSearch (args) {
|
|
134
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
135
|
+
let orgcondition = '1=1'
|
|
136
|
+
if (this.f_orgid && this.f_orgid[0]) {
|
|
137
|
+
orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
|
|
138
|
+
}
|
|
139
|
+
if (this.f_depid && this.f_depid[0]) {
|
|
140
|
+
orgcondition += ' and f_depid in (' + this.f_depid + ')'
|
|
141
|
+
}
|
|
142
|
+
if(this.f_operatorid && this.f_operatorid[0]) {
|
|
143
|
+
orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
|
|
144
|
+
}
|
|
145
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
146
|
+
this.$refs.paged.search(args)
|
|
147
|
+
},
|
|
148
|
+
getRes (obj) {
|
|
149
|
+
this.orgname = obj.res[0]
|
|
150
|
+
this.depresid = obj.resids
|
|
151
|
+
this.f_orgid = obj.resids
|
|
152
|
+
},
|
|
153
|
+
getdep (obj, val) {
|
|
154
|
+
this.depname = val[0]
|
|
155
|
+
this.userresid = obj
|
|
156
|
+
this.f_depid = obj
|
|
157
|
+
},
|
|
158
|
+
getuser ( obj, val) {
|
|
159
|
+
this.operatorname = val[0]
|
|
160
|
+
this.f_operatorid = obj
|
|
161
|
+
}
|
|
162
|
+
},
|
|
163
|
+
watch: {
|
|
164
|
+
'model.data' (val) {
|
|
165
|
+
this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
|
|
166
|
+
}
|
|
167
|
+
},
|
|
168
|
+
computed: {
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
</script>
|
|
172
|
+
<style scoped>
|
|
173
|
+
.noborder{
|
|
174
|
+
border: none;
|
|
175
|
+
}
|
|
176
|
+
</style>
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
<div class="col-sm-2 form-group">
|
|
92
92
|
<label class="font_normal_body">表    号</label>
|
|
93
93
|
<input
|
|
94
|
-
class="input_search" condition="f_meternumber = '{}'"
|
|
94
|
+
class="input_search" condition="u1.f_meternumber = '{}'"
|
|
95
95
|
placeholder='表号'
|
|
96
96
|
style="width:60%"
|
|
97
97
|
type="text"
|
|
@@ -340,7 +340,7 @@
|
|
|
340
340
|
this.criteriaShow = !this.criteriaShow
|
|
341
341
|
},
|
|
342
342
|
getorg(condition,obj) {
|
|
343
|
-
this.orgcondition = condition
|
|
343
|
+
this.orgcondition = condition.replace('f_orgid','i.f_orgid')
|
|
344
344
|
this.orgname = obj.orgnames[0]
|
|
345
345
|
},
|
|
346
346
|
initQueryParam () {
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
<div class="col-sm-2 form-group">
|
|
92
92
|
<label class="font_normal_body">表    号</label>
|
|
93
93
|
<input
|
|
94
|
-
class="input_search" condition="f_meternumber = '{}'"
|
|
94
|
+
class="input_search" condition="u1.f_meternumber = '{}'"
|
|
95
95
|
placeholder='表号'
|
|
96
96
|
style="width:60%"
|
|
97
97
|
type="text"
|
|
@@ -338,7 +338,7 @@
|
|
|
338
338
|
this.criteriaShow = !this.criteriaShow
|
|
339
339
|
},
|
|
340
340
|
getorg(condition,obj) {
|
|
341
|
-
this.orgcondition = condition
|
|
341
|
+
this.orgcondition = condition.replace('f_orgid','i.f_orgid')
|
|
342
342
|
this.orgname = obj.orgnames[0]
|
|
343
343
|
},
|
|
344
344
|
initQueryParam () {
|
package/src/reportManage.js
CHANGED
|
@@ -692,10 +692,12 @@ export default function () {
|
|
|
692
692
|
Vue.component('shangye-num', (resolve) => {
|
|
693
693
|
require(['./components/SellReport/shangyenum'], resolve)
|
|
694
694
|
})
|
|
695
|
-
|
|
696
695
|
// 涉县报表展示组件(客户服务部日收费统计表)
|
|
697
696
|
Vue.component('sx-summary', (resolve) => {
|
|
698
697
|
require(['./components/SellReport/shexian/SxSummary'], resolve)
|
|
699
698
|
})
|
|
700
|
-
|
|
699
|
+
// 涉县报表展示组件(燃气营收月报表)
|
|
700
|
+
Vue.component('sx-month-summary', (resolve) => {
|
|
701
|
+
require(['./components/SellReport/shexian/SxMonthSummary.vue'], resolve)
|
|
702
|
+
})
|
|
701
703
|
}
|