manage-client 3.1.33 → 3.1.34
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/BusinessClassify.vue +1 -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/FillGasQuery.vue +19 -1
package/package.json
CHANGED
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
</div>
|
|
59
59
|
</criteria>
|
|
60
60
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
61
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
61
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
62
62
|
<thead>
|
|
63
63
|
<tr>
|
|
64
64
|
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
</div>
|
|
58
58
|
</criteria>
|
|
59
59
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
60
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
60
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
61
61
|
<thead>
|
|
62
62
|
<tr>
|
|
63
63
|
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
</div>
|
|
67
67
|
</criteria>
|
|
68
68
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
69
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
69
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
70
70
|
<thead>
|
|
71
71
|
<tr>
|
|
72
72
|
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
|
|
@@ -243,7 +243,6 @@
|
|
|
243
243
|
if(a[i].split('</td>').length-1>len){
|
|
244
244
|
len=a[i].split('</td>').length-1
|
|
245
245
|
}
|
|
246
|
-
continue
|
|
247
246
|
}
|
|
248
247
|
this.tablen=len
|
|
249
248
|
}
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
</div>
|
|
59
59
|
</criteria>
|
|
60
60
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
61
|
-
<table class='tableprint' style="margin: 0px auto;"
|
|
61
|
+
<table class='tableprint' style="margin: 0px auto;">
|
|
62
62
|
<thead>
|
|
63
63
|
<tr>
|
|
64
64
|
<th colspan='18' style="font-weight: normal; text-align: left;">
|
|
@@ -44,15 +44,15 @@
|
|
|
44
44
|
</div>
|
|
45
45
|
</criteria>
|
|
46
46
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
47
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
47
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
48
48
|
<thead>
|
|
49
49
|
<tr>
|
|
50
|
-
<th colspan='
|
|
50
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
|
|
51
51
|
<h3 style="text-align: center">收费结账报表</h3>
|
|
52
52
|
</th>
|
|
53
53
|
</tr>
|
|
54
54
|
<tr>
|
|
55
|
-
<th colspan='
|
|
55
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
56
56
|
开始时间：{{model.model.startDate}}
|
|
57
57
|
结束时间：{{ model.model.endDate }} <br/>
|
|
58
58
|
<!--打印时间：{{{$parent.printTime}}}-->
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
</th>
|
|
62
62
|
</tr>
|
|
63
63
|
<tr>
|
|
64
|
-
<th colspan='
|
|
64
|
+
<th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
65
65
|
<div>
|
|
66
66
|
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
67
67
|
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
@@ -71,15 +71,15 @@
|
|
|
71
71
|
</tr>
|
|
72
72
|
</thead>
|
|
73
73
|
<tr>
|
|
74
|
-
<td colspan='
|
|
74
|
+
<td :colspan='$parent.spans'>
|
|
75
75
|
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
76
76
|
</td>
|
|
77
77
|
</tr>
|
|
78
78
|
<tfoot>
|
|
79
79
|
<tr style="text-align: left">
|
|
80
|
-
<th colspan='3'>财务审核：</th>
|
|
81
|
-
<th colspan='3'>收款审核：</th>
|
|
82
|
-
<th colspan='3'>收款员：</th>
|
|
80
|
+
<th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
|
|
81
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
|
|
82
|
+
<th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
|
|
83
83
|
</tr>
|
|
84
84
|
</tfoot>
|
|
85
85
|
</table>
|
|
@@ -148,6 +148,7 @@
|
|
|
148
148
|
f_orgid: 'this.model.f_orgid'}),
|
|
149
149
|
reportStr: null,
|
|
150
150
|
show: false,
|
|
151
|
+
spans: 0,
|
|
151
152
|
initres: {
|
|
152
153
|
org: [this.$login.f.orgid],
|
|
153
154
|
dep: [],
|
|
@@ -156,10 +157,8 @@
|
|
|
156
157
|
}
|
|
157
158
|
},
|
|
158
159
|
ready () {
|
|
159
|
-
this.$refs.paged.$refs.criteria.$refs.res_select.sliceareashow = false
|
|
160
160
|
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
161
161
|
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
162
|
-
// this.$refs.paged.$refs.criteria.search()
|
|
163
162
|
console.log(this.$login.f)
|
|
164
163
|
},
|
|
165
164
|
methods: {
|
|
@@ -217,6 +216,16 @@
|
|
|
217
216
|
} else {
|
|
218
217
|
this.reportStr = null
|
|
219
218
|
}
|
|
219
|
+
},
|
|
220
|
+
'model.data' (val) {
|
|
221
|
+
let len=0
|
|
222
|
+
let a=val.split('</tr>')
|
|
223
|
+
for(let i=0;i<a.length;i++){
|
|
224
|
+
if(a[i].split('</td>').length-1>len){
|
|
225
|
+
len=a[i].split('</td>').length-1
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
this.spans = len
|
|
220
229
|
}
|
|
221
230
|
},
|
|
222
231
|
computed: {
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
</div>
|
|
73
73
|
</criteria>
|
|
74
74
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
75
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
75
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
76
76
|
<thead>
|
|
77
77
|
<tr>
|
|
78
78
|
<th colspan='8' style="font-weight: normal; text-align: left;">
|
|
@@ -1,250 +1,250 @@
|
|
|
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
|
-
<p class="bg-info text-center" style="padding: 8px;">其他收费汇总</p>
|
|
6
|
-
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
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 class="font_normal_body" for="startDate">开始日期:</label>
|
|
11
|
-
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
12
|
-
v-model="model.startDate"
|
|
13
|
-
:value.sync="model.startDate"
|
|
14
|
-
:disabled-days-of-Week="[]"
|
|
15
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
-
:show-reset-button="reset">
|
|
17
|
-
</datepicker>
|
|
18
|
-
</div>
|
|
19
|
-
<div class="col-sm-2 form-group" >
|
|
20
|
-
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
21
|
-
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
22
|
-
v-model="model.endDate"
|
|
23
|
-
:value.sync="model.endDate"
|
|
24
|
-
:disabled-days-of-Week="[]"
|
|
25
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
-
:show-reset-button="reset">
|
|
27
|
-
</datepicker>
|
|
28
|
-
</div>
|
|
29
|
-
<res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
30
|
-
<!--<div class="col-sm-4">-->
|
|
31
|
-
<!--<label class="font_normal_body"> 公司 </label>-->
|
|
32
|
-
<!--<right-tree @re-res="$parent.$parent.getRes"></right-tree>-->
|
|
33
|
-
<!--</div>-->
|
|
34
|
-
<!--<div class="col-sm-4">-->
|
|
35
|
-
<!--<label class="font_normal_body"> 部门 </label>-->
|
|
36
|
-
<!--<res-select restype='department'-->
|
|
37
|
-
<!--is-mul="false"-->
|
|
38
|
-
<!--@res-select="$parent.$parent.getdep"-->
|
|
39
|
-
<!--:parentresid="$parent.$parent.depresid"-->
|
|
40
|
-
<!--:initresid='$parent.$parent.depid'>-->
|
|
41
|
-
<!--</res-select>-->
|
|
42
|
-
<!--</div>-->
|
|
43
|
-
<div style = "float:right;">
|
|
44
|
-
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
45
|
-
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
46
|
-
<report-excel id='gasprice'></report-excel>
|
|
47
|
-
</div>
|
|
48
|
-
</div>
|
|
49
|
-
<!--<div class="span" style = "float:right;">-->
|
|
50
|
-
|
|
51
|
-
<!--</div>-->
|
|
52
|
-
</div>
|
|
53
|
-
</criteria>
|
|
54
|
-
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
55
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
56
|
-
<thead>
|
|
57
|
-
<tr>
|
|
58
|
-
<th colspan='{{$parent.spans}}' style="font-weight: bold; text-align: left;">
|
|
59
|
-
<h3 style="text-align: center">其他收费汇总</h3>
|
|
60
|
-
</th>
|
|
61
|
-
</tr>
|
|
62
|
-
<tr>
|
|
63
|
-
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
|
|
64
|
-
开始时间：{{model.model.startDate}}
|
|
65
|
-
结束时间：{{ model.model.endDate }}
|
|
66
|
-
</th>
|
|
67
|
-
</tr>
|
|
68
|
-
<tr>
|
|
69
|
-
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
|
|
70
|
-
打印时间：{{{$parent.printTime}}}
|
|
71
|
-
</th>
|
|
72
|
-
</tr>
|
|
73
|
-
<tr>
|
|
74
|
-
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
|
|
75
|
-
<div>
|
|
76
|
-
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
77
|
-
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
78
|
-
</div>
|
|
79
|
-
</th>
|
|
80
|
-
</tr>
|
|
81
|
-
</thead>
|
|
82
|
-
<tr>
|
|
83
|
-
<td style="font-weight: normal;" id="test">
|
|
84
|
-
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
85
|
-
</td>
|
|
86
|
-
</tr>
|
|
87
|
-
<tfoot>
|
|
88
|
-
<tr style="text-align: left">
|
|
89
|
-
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: left;">
|
|
90
|
-
收款人：
|
|
91
|
-
审核人：
|
|
92
|
-
经手人：
|
|
93
|
-
</th>
|
|
94
|
-
</tr>
|
|
95
|
-
</tfoot>
|
|
96
|
-
</table>
|
|
97
|
-
{{{ $parent.reportStr}}}
|
|
98
|
-
</div>
|
|
99
|
-
</criteria-paged>
|
|
100
|
-
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
101
|
-
<header slot="modal-header" class="modal-header">
|
|
102
|
-
<h4 class="modal-title">输入文件名称</h4>
|
|
103
|
-
</header>
|
|
104
|
-
<article slot="modal-body" class="modal-body">
|
|
105
|
-
<div class="form-group">
|
|
106
|
-
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
107
|
-
</div>
|
|
108
|
-
</article>
|
|
109
|
-
<footer slot="modal-footer" class="modal-footer">
|
|
110
|
-
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
111
|
-
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
112
|
-
</footer>
|
|
113
|
-
</modal>
|
|
114
|
-
</div>
|
|
115
|
-
</template>
|
|
116
|
-
|
|
117
|
-
<script>
|
|
118
|
-
import { DataModel } from 'vue-client'
|
|
119
|
-
import co from 'co'
|
|
120
|
-
let saveFile = function * (self) {
|
|
121
|
-
// 线验证文件是否重名
|
|
122
|
-
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
123
|
-
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
124
|
-
{resolveMsg: null, rejectMsg: null})
|
|
125
|
-
if (count.data.length > 0) {
|
|
126
|
-
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
127
|
-
return
|
|
128
|
-
}
|
|
129
|
-
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
130
|
-
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
131
|
-
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
132
|
-
f_outlets: this.$login.f.depname})
|
|
133
|
-
if (saveBack.data.status === 'succeed') {
|
|
134
|
-
self.show = false
|
|
135
|
-
self.filename = ''
|
|
136
|
-
// 后台保存完成，通知刷新
|
|
137
|
-
self.$dispatch('save-success', self.filename)
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
export default {
|
|
141
|
-
title: '其他收费汇总',
|
|
142
|
-
props: ['data'],
|
|
143
|
-
data () {
|
|
144
|
-
return {
|
|
145
|
-
printTime: this.$login.toStandardTimeString(),
|
|
146
|
-
depresid: [],
|
|
147
|
-
userresid: [],
|
|
148
|
-
initres: {
|
|
149
|
-
org:[this.$login.f.orgid],
|
|
150
|
-
dep:[],
|
|
151
|
-
user:[]
|
|
152
|
-
},
|
|
153
|
-
f_orgid: this.$login.f.orgid,
|
|
154
|
-
f_depid: this.$login.f.depids,
|
|
155
|
-
f_operatorid: this.$login.f.id,
|
|
156
|
-
operatorid: [],
|
|
157
|
-
depid: [],
|
|
158
|
-
orgname: '',
|
|
159
|
-
depname: '',
|
|
160
|
-
operatorname: '',
|
|
161
|
-
orgCondtionStr: '1=1',
|
|
162
|
-
model: new DataModel('rs/report/othercharge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
163
|
-
f_orgid: 'this.model.f_orgid'}),
|
|
164
|
-
reportStr: null,
|
|
165
|
-
show: false,
|
|
166
|
-
spans: ''
|
|
167
|
-
}
|
|
168
|
-
},
|
|
169
|
-
ready () {
|
|
170
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
171
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
172
|
-
// this.$refs.paged.$refs.criteria.search()
|
|
173
|
-
},
|
|
174
|
-
methods: {
|
|
175
|
-
searchData () {
|
|
176
|
-
this.$refs.paged.$refs.criteria.search()
|
|
177
|
-
},
|
|
178
|
-
selfSearch (args) {
|
|
179
|
-
this.printTime = this.$login.toStandardTimeString()
|
|
180
|
-
let orgstr = this.orgCondtionStr
|
|
181
|
-
args.condition = `${args.condition} ` + orgstr
|
|
182
|
-
this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
|
|
183
|
-
this.$refs.paged.search(args)
|
|
184
|
-
},
|
|
185
|
-
getRes (condition, obj) {
|
|
186
|
-
this.orgCondtionStr = condition
|
|
187
|
-
this.orgname = obj.orgnames[0]
|
|
188
|
-
this.depname = obj.depnames[0]
|
|
189
|
-
},
|
|
190
|
-
// getdep (obj, val) {
|
|
191
|
-
// // this.depname = val[0]
|
|
192
|
-
// this.userresid = obj
|
|
193
|
-
// this.f_depid = obj
|
|
194
|
-
// },
|
|
195
|
-
// getuser ( obj, val) {
|
|
196
|
-
// this.operatorname = val[0]
|
|
197
|
-
// this.f_operatorid = obj
|
|
198
|
-
// },
|
|
199
|
-
|
|
200
|
-
// 根据文件路径获取储存的报表内容
|
|
201
|
-
getFileContent (path) {
|
|
202
|
-
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
203
|
-
this.reportStr = res.data.filecontent
|
|
204
|
-
this.model.state = '正确'
|
|
205
|
-
})
|
|
206
|
-
},
|
|
207
|
-
confirm () {
|
|
208
|
-
if (!this.filename || this.filename === '') {
|
|
209
|
-
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
210
|
-
}
|
|
211
|
-
let saveGen = saveFile(this)
|
|
212
|
-
co(saveGen)
|
|
213
|
-
},
|
|
214
|
-
close () {
|
|
215
|
-
this.show = false
|
|
216
|
-
},
|
|
217
|
-
// 将报表保存成文件
|
|
218
|
-
confirmReport () {
|
|
219
|
-
this.show = true
|
|
220
|
-
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
221
|
-
}
|
|
222
|
-
},
|
|
223
|
-
watch: {
|
|
224
|
-
'data' (val) {
|
|
225
|
-
if (val.f_files_path) {
|
|
226
|
-
this.getFileContent(val.f_files_path)
|
|
227
|
-
} else {
|
|
228
|
-
this.reportStr = null
|
|
229
|
-
}
|
|
230
|
-
},
|
|
231
|
-
'model.data' (val) {
|
|
232
|
-
let tab = document.getElementById('test').children[0]
|
|
233
|
-
var tds = tab.getElementsByTagName('td')
|
|
234
|
-
var num = 0
|
|
235
|
-
for (let td of tds) {
|
|
236
|
-
let span = td.getAttribute('colspan')
|
|
237
|
-
num = num + ((span ? span : 1) - 0)
|
|
238
|
-
}
|
|
239
|
-
this.spans = num
|
|
240
|
-
}
|
|
241
|
-
},
|
|
242
|
-
computed: {
|
|
243
|
-
}
|
|
244
|
-
}
|
|
245
|
-
</script>
|
|
246
|
-
<style scoped>
|
|
247
|
-
.noborder{
|
|
248
|
-
border: none;
|
|
249
|
-
}
|
|
250
|
-
</style>
|
|
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
|
+
<p class="bg-info text-center" style="padding: 8px;">其他收费汇总</p>
|
|
6
|
+
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
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 class="font_normal_body" for="startDate">开始日期:</label>
|
|
11
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
12
|
+
v-model="model.startDate"
|
|
13
|
+
:value.sync="model.startDate"
|
|
14
|
+
:disabled-days-of-Week="[]"
|
|
15
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
+
:show-reset-button="reset">
|
|
17
|
+
</datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group" >
|
|
20
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
21
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
22
|
+
v-model="model.endDate"
|
|
23
|
+
:value.sync="model.endDate"
|
|
24
|
+
:disabled-days-of-Week="[]"
|
|
25
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
+
:show-reset-button="reset">
|
|
27
|
+
</datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
30
|
+
<!--<div class="col-sm-4">-->
|
|
31
|
+
<!--<label class="font_normal_body"> 公司 </label>-->
|
|
32
|
+
<!--<right-tree @re-res="$parent.$parent.getRes"></right-tree>-->
|
|
33
|
+
<!--</div>-->
|
|
34
|
+
<!--<div class="col-sm-4">-->
|
|
35
|
+
<!--<label class="font_normal_body"> 部门 </label>-->
|
|
36
|
+
<!--<res-select restype='department'-->
|
|
37
|
+
<!--is-mul="false"-->
|
|
38
|
+
<!--@res-select="$parent.$parent.getdep"-->
|
|
39
|
+
<!--:parentresid="$parent.$parent.depresid"-->
|
|
40
|
+
<!--:initresid='$parent.$parent.depid'>-->
|
|
41
|
+
<!--</res-select>-->
|
|
42
|
+
<!--</div>-->
|
|
43
|
+
<div style = "float:right;">
|
|
44
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
45
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
46
|
+
<report-excel id='gasprice'></report-excel>
|
|
47
|
+
</div>
|
|
48
|
+
</div>
|
|
49
|
+
<!--<div class="span" style = "float:right;">-->
|
|
50
|
+
|
|
51
|
+
<!--</div>-->
|
|
52
|
+
</div>
|
|
53
|
+
</criteria>
|
|
54
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
55
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
56
|
+
<thead>
|
|
57
|
+
<tr>
|
|
58
|
+
<th colspan='{{$parent.spans}}' style="font-weight: bold; text-align: left;">
|
|
59
|
+
<h3 style="text-align: center">其他收费汇总</h3>
|
|
60
|
+
</th>
|
|
61
|
+
</tr>
|
|
62
|
+
<tr>
|
|
63
|
+
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
|
|
64
|
+
开始时间：{{model.model.startDate}}
|
|
65
|
+
结束时间：{{ model.model.endDate }}
|
|
66
|
+
</th>
|
|
67
|
+
</tr>
|
|
68
|
+
<tr>
|
|
69
|
+
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
|
|
70
|
+
打印时间：{{{$parent.printTime}}}
|
|
71
|
+
</th>
|
|
72
|
+
</tr>
|
|
73
|
+
<tr>
|
|
74
|
+
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
|
|
75
|
+
<div>
|
|
76
|
+
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
77
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
78
|
+
</div>
|
|
79
|
+
</th>
|
|
80
|
+
</tr>
|
|
81
|
+
</thead>
|
|
82
|
+
<tr>
|
|
83
|
+
<td style="font-weight: normal;" id="test">
|
|
84
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
85
|
+
</td>
|
|
86
|
+
</tr>
|
|
87
|
+
<tfoot>
|
|
88
|
+
<tr style="text-align: left">
|
|
89
|
+
<th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: left;">
|
|
90
|
+
收款人：
|
|
91
|
+
审核人：
|
|
92
|
+
经手人：
|
|
93
|
+
</th>
|
|
94
|
+
</tr>
|
|
95
|
+
</tfoot>
|
|
96
|
+
</table>
|
|
97
|
+
{{{ $parent.reportStr}}}
|
|
98
|
+
</div>
|
|
99
|
+
</criteria-paged>
|
|
100
|
+
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
101
|
+
<header slot="modal-header" class="modal-header">
|
|
102
|
+
<h4 class="modal-title">输入文件名称</h4>
|
|
103
|
+
</header>
|
|
104
|
+
<article slot="modal-body" class="modal-body">
|
|
105
|
+
<div class="form-group">
|
|
106
|
+
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
107
|
+
</div>
|
|
108
|
+
</article>
|
|
109
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
110
|
+
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
111
|
+
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
112
|
+
</footer>
|
|
113
|
+
</modal>
|
|
114
|
+
</div>
|
|
115
|
+
</template>
|
|
116
|
+
|
|
117
|
+
<script>
|
|
118
|
+
import { DataModel } from 'vue-client'
|
|
119
|
+
import co from 'co'
|
|
120
|
+
let saveFile = function * (self) {
|
|
121
|
+
// 线验证文件是否重名
|
|
122
|
+
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
123
|
+
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
124
|
+
{resolveMsg: null, rejectMsg: null})
|
|
125
|
+
if (count.data.length > 0) {
|
|
126
|
+
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
127
|
+
return
|
|
128
|
+
}
|
|
129
|
+
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
130
|
+
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
131
|
+
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
132
|
+
f_outlets: this.$login.f.depname})
|
|
133
|
+
if (saveBack.data.status === 'succeed') {
|
|
134
|
+
self.show = false
|
|
135
|
+
self.filename = ''
|
|
136
|
+
// 后台保存完成，通知刷新
|
|
137
|
+
self.$dispatch('save-success', self.filename)
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
export default {
|
|
141
|
+
title: '其他收费汇总',
|
|
142
|
+
props: ['data'],
|
|
143
|
+
data () {
|
|
144
|
+
return {
|
|
145
|
+
printTime: this.$login.toStandardTimeString(),
|
|
146
|
+
depresid: [],
|
|
147
|
+
userresid: [],
|
|
148
|
+
initres: {
|
|
149
|
+
org:[this.$login.f.orgid],
|
|
150
|
+
dep:[],
|
|
151
|
+
user:[]
|
|
152
|
+
},
|
|
153
|
+
f_orgid: this.$login.f.orgid,
|
|
154
|
+
f_depid: this.$login.f.depids,
|
|
155
|
+
f_operatorid: this.$login.f.id,
|
|
156
|
+
operatorid: [],
|
|
157
|
+
depid: [],
|
|
158
|
+
orgname: '',
|
|
159
|
+
depname: '',
|
|
160
|
+
operatorname: '',
|
|
161
|
+
orgCondtionStr: '1=1',
|
|
162
|
+
model: new DataModel('rs/report/othercharge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
163
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
164
|
+
reportStr: null,
|
|
165
|
+
show: false,
|
|
166
|
+
spans: ''
|
|
167
|
+
}
|
|
168
|
+
},
|
|
169
|
+
ready () {
|
|
170
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
171
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
172
|
+
// this.$refs.paged.$refs.criteria.search()
|
|
173
|
+
},
|
|
174
|
+
methods: {
|
|
175
|
+
searchData () {
|
|
176
|
+
this.$refs.paged.$refs.criteria.search()
|
|
177
|
+
},
|
|
178
|
+
selfSearch (args) {
|
|
179
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
180
|
+
let orgstr = this.orgCondtionStr
|
|
181
|
+
args.condition = `${args.condition} ` + orgstr
|
|
182
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
|
|
183
|
+
this.$refs.paged.search(args)
|
|
184
|
+
},
|
|
185
|
+
getRes (condition, obj) {
|
|
186
|
+
this.orgCondtionStr = condition
|
|
187
|
+
this.orgname = obj.orgnames[0]
|
|
188
|
+
this.depname = obj.depnames[0]
|
|
189
|
+
},
|
|
190
|
+
// getdep (obj, val) {
|
|
191
|
+
// // this.depname = val[0]
|
|
192
|
+
// this.userresid = obj
|
|
193
|
+
// this.f_depid = obj
|
|
194
|
+
// },
|
|
195
|
+
// getuser ( obj, val) {
|
|
196
|
+
// this.operatorname = val[0]
|
|
197
|
+
// this.f_operatorid = obj
|
|
198
|
+
// },
|
|
199
|
+
|
|
200
|
+
// 根据文件路径获取储存的报表内容
|
|
201
|
+
getFileContent (path) {
|
|
202
|
+
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
203
|
+
this.reportStr = res.data.filecontent
|
|
204
|
+
this.model.state = '正确'
|
|
205
|
+
})
|
|
206
|
+
},
|
|
207
|
+
confirm () {
|
|
208
|
+
if (!this.filename || this.filename === '') {
|
|
209
|
+
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
210
|
+
}
|
|
211
|
+
let saveGen = saveFile(this)
|
|
212
|
+
co(saveGen)
|
|
213
|
+
},
|
|
214
|
+
close () {
|
|
215
|
+
this.show = false
|
|
216
|
+
},
|
|
217
|
+
// 将报表保存成文件
|
|
218
|
+
confirmReport () {
|
|
219
|
+
this.show = true
|
|
220
|
+
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
221
|
+
}
|
|
222
|
+
},
|
|
223
|
+
watch: {
|
|
224
|
+
'data' (val) {
|
|
225
|
+
if (val.f_files_path) {
|
|
226
|
+
this.getFileContent(val.f_files_path)
|
|
227
|
+
} else {
|
|
228
|
+
this.reportStr = null
|
|
229
|
+
}
|
|
230
|
+
},
|
|
231
|
+
'model.data' (val) {
|
|
232
|
+
let tab = document.getElementById('test').children[0]
|
|
233
|
+
var tds = tab.getElementsByTagName('td')
|
|
234
|
+
var num = 0
|
|
235
|
+
for (let td of tds) {
|
|
236
|
+
let span = td.getAttribute('colspan')
|
|
237
|
+
num = num + ((span ? span : 1) - 0)
|
|
238
|
+
}
|
|
239
|
+
this.spans = num
|
|
240
|
+
}
|
|
241
|
+
},
|
|
242
|
+
computed: {
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
</script>
|
|
246
|
+
<style scoped>
|
|
247
|
+
.noborder{
|
|
248
|
+
border: none;
|
|
249
|
+
}
|
|
250
|
+
</style>
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
</div>
|
|
69
69
|
</criteria>
|
|
70
70
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
71
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
71
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
72
72
|
<thead>
|
|
73
73
|
<tr>
|
|
74
74
|
<th :colspan='$parent.spans' style="font-weight: bold; text-align: left;">
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
</div>
|
|
91
91
|
</criteria>
|
|
92
92
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
93
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
93
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
94
94
|
<thead>
|
|
95
95
|
<tr>
|
|
96
96
|
<th :colspan='$parent.spans' style="font-weight: bold; text-align: left;">
|
|
@@ -1,227 +1,227 @@
|
|
|
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
|
-
<p class="bg-info text-center" style="padding: 8px;">销售月报表</p>
|
|
6
|
-
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
7
|
-
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
8
|
-
<div class="row">
|
|
9
|
-
<div class="col-sm-4" >
|
|
10
|
-
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
11
|
-
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
12
|
-
v-model="model.startDate"
|
|
13
|
-
:value.sync="model.startDate"
|
|
14
|
-
:disabled-days-of-Week="[]"
|
|
15
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
-
:show-reset-button="reset">
|
|
17
|
-
</datepicker>
|
|
18
|
-
</div>
|
|
19
|
-
<div class="col-sm-4" >
|
|
20
|
-
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
21
|
-
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
22
|
-
v-model="model.endDate"
|
|
23
|
-
:value.sync="model.endDate"
|
|
24
|
-
:disabled-days-of-Week="[]"
|
|
25
|
-
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
-
:show-reset-button="reset">
|
|
27
|
-
</datepicker>
|
|
28
|
-
</div>
|
|
29
|
-
<div class="col-sm-4">
|
|
30
|
-
<label class="font_normal_body"> 公司 </label>
|
|
31
|
-
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
32
|
-
</div>
|
|
33
|
-
|
|
34
|
-
</div>
|
|
35
|
-
<div class="span" style = "float:right;">
|
|
36
|
-
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
37
|
-
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
38
|
-
<report-excel id='gasprice'></report-excel>
|
|
39
|
-
</div>
|
|
40
|
-
</div>
|
|
41
|
-
</criteria>
|
|
42
|
-
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
43
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
44
|
-
<thead>
|
|
45
|
-
<tr>
|
|
46
|
-
<th colspan='17' style="font-weight: normal; text-align: left;">
|
|
47
|
-
<h3 style="text-align: center">销售月报表</h3>
|
|
48
|
-
</th>
|
|
49
|
-
</tr>
|
|
50
|
-
<tr>
|
|
51
|
-
<th colspan='17' style="font-weight: normal; text-align: center;">
|
|
52
|
-
开始时间：{{model.model.startDate}}
|
|
53
|
-
结束时间：{{ model.model.endDate }}
|
|
54
|
-
</th>
|
|
55
|
-
</tr>
|
|
56
|
-
<tr>
|
|
57
|
-
<th colspan='17' style="font-weight: normal; text-align: center;">
|
|
58
|
-
打印时间：{{{$parent.printTime}}}
|
|
59
|
-
</th>
|
|
60
|
-
</tr>
|
|
61
|
-
<tr>
|
|
62
|
-
<th colspan='17' style="font-weight: normal; text-align: center;">
|
|
63
|
-
<div>
|
|
64
|
-
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
65
|
-
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
66
|
-
<span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
|
|
67
|
-
</div>
|
|
68
|
-
</th>
|
|
69
|
-
</tr>
|
|
70
|
-
</thead>
|
|
71
|
-
<tr>
|
|
72
|
-
<td colspan='17'>
|
|
73
|
-
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
74
|
-
</td>
|
|
75
|
-
</tr>
|
|
76
|
-
<tfoot>
|
|
77
|
-
<tr style="text-align: left">
|
|
78
|
-
<th colspan='6'>财务审核：</th>
|
|
79
|
-
<th colspan='6'>收款审核：</th>
|
|
80
|
-
<th colspan='5'>收款员：</th>
|
|
81
|
-
</tr>
|
|
82
|
-
</tfoot>
|
|
83
|
-
</table>
|
|
84
|
-
{{{ $parent.reportStr}}}
|
|
85
|
-
</div>
|
|
86
|
-
</criteria-paged>
|
|
87
|
-
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
88
|
-
<header slot="modal-header" class="modal-header">
|
|
89
|
-
<h4 class="modal-title">输入文件名称</h4>
|
|
90
|
-
</header>
|
|
91
|
-
<article slot="modal-body" class="modal-body">
|
|
92
|
-
<div class="form-group">
|
|
93
|
-
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
94
|
-
</div>
|
|
95
|
-
</article>
|
|
96
|
-
<footer slot="modal-footer" class="modal-footer">
|
|
97
|
-
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
98
|
-
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
99
|
-
</footer>
|
|
100
|
-
</modal>
|
|
101
|
-
</div>
|
|
102
|
-
</template>
|
|
103
|
-
|
|
104
|
-
<script>
|
|
105
|
-
import { DataModel } from 'vue-client'
|
|
106
|
-
import co from 'co'
|
|
107
|
-
let saveFile = function * (self) {
|
|
108
|
-
// 线验证文件是否重名
|
|
109
|
-
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
110
|
-
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
111
|
-
{resolveMsg: null, rejectMsg: null})
|
|
112
|
-
if (count.data.length > 0) {
|
|
113
|
-
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
114
|
-
return
|
|
115
|
-
}
|
|
116
|
-
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
117
|
-
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
118
|
-
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
119
|
-
f_outlets: this.$login.f.depname})
|
|
120
|
-
if (saveBack.data.status === 'succeed') {
|
|
121
|
-
self.show = false
|
|
122
|
-
self.filename = ''
|
|
123
|
-
// 后台保存完成，通知刷新
|
|
124
|
-
self.$dispatch('save-success', self.filename)
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
export default {
|
|
128
|
-
title: '销售月报表',
|
|
129
|
-
props: ['data'],
|
|
130
|
-
data () {
|
|
131
|
-
return {
|
|
132
|
-
printTime: this.$login.toStandardTimeString(),
|
|
133
|
-
depresid: [],
|
|
134
|
-
userresid: [],
|
|
135
|
-
f_orgid: this.$login.f.orgid,
|
|
136
|
-
f_depid: this.$login.f.depids,
|
|
137
|
-
f_operatorid: this.$login.f.id,
|
|
138
|
-
operatorid: [],
|
|
139
|
-
depid: [],
|
|
140
|
-
orgname: '',
|
|
141
|
-
depname: '',
|
|
142
|
-
operatorname: '',
|
|
143
|
-
f_inputtor:[],
|
|
144
|
-
f_user_type:'',
|
|
145
|
-
orgCondtionStr: '1=1',
|
|
146
|
-
model: new DataModel('rs/report/saleMonthReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
147
|
-
f_orgid: 'this.model.f_orgid'}),
|
|
148
|
-
reportStr: null,
|
|
149
|
-
show: false
|
|
150
|
-
}
|
|
151
|
-
},
|
|
152
|
-
ready () {
|
|
153
|
-
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
154
|
-
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
155
|
-
this.$refs.paged.$refs.criteria.search()
|
|
156
|
-
console.log(this.$login.f)
|
|
157
|
-
},
|
|
158
|
-
methods: {
|
|
159
|
-
searchData () {
|
|
160
|
-
this.$refs.paged.$refs.criteria.search()
|
|
161
|
-
},
|
|
162
|
-
selfSearch (args) {
|
|
163
|
-
let orgcondition = 'f_orgid in ( ' + this.f_orgid + ')'
|
|
164
|
-
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
165
|
-
this.$refs.paged.search(args)
|
|
166
|
-
},
|
|
167
|
-
getRes (obj) {
|
|
168
|
-
this.orgname = obj.res[0]
|
|
169
|
-
this.depresid = obj.resids
|
|
170
|
-
this.f_orgid = obj.resids
|
|
171
|
-
},
|
|
172
|
-
getdep (obj, val) {
|
|
173
|
-
// this.depname = val[0]
|
|
174
|
-
this.userresid = obj
|
|
175
|
-
this.f_depid = obj
|
|
176
|
-
},
|
|
177
|
-
getuser ( obj, val) {
|
|
178
|
-
this.operatorname = val[0]
|
|
179
|
-
this.f_operatorid = obj
|
|
180
|
-
},
|
|
181
|
-
// 根据文件路径获取储存的报表内容
|
|
182
|
-
getFileContent (path) {
|
|
183
|
-
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
184
|
-
this.reportStr = res.data.filecontent
|
|
185
|
-
this.model.state = '正确'
|
|
186
|
-
})
|
|
187
|
-
},
|
|
188
|
-
confirm () {
|
|
189
|
-
if (!this.filename || this.filename === '') {
|
|
190
|
-
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
191
|
-
}
|
|
192
|
-
let saveGen = saveFile(this)
|
|
193
|
-
co(saveGen)
|
|
194
|
-
},
|
|
195
|
-
close () {
|
|
196
|
-
this.show = false
|
|
197
|
-
},
|
|
198
|
-
// 将报表保存成文件
|
|
199
|
-
confirmReport () {
|
|
200
|
-
this.show = true
|
|
201
|
-
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
202
|
-
},
|
|
203
|
-
},
|
|
204
|
-
watch: {
|
|
205
|
-
'data' (val) {
|
|
206
|
-
if (val.f_files_path) {
|
|
207
|
-
this.getFileContent(val.f_files_path)
|
|
208
|
-
} else {
|
|
209
|
-
this.reportStr = null
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
},
|
|
213
|
-
computed: {
|
|
214
|
-
usertypes() {
|
|
215
|
-
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
216
|
-
},
|
|
217
|
-
inputtor() {
|
|
218
|
-
return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
|
|
219
|
-
},
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
</script>
|
|
223
|
-
<style scoped>
|
|
224
|
-
.noborder{
|
|
225
|
-
border: none;
|
|
226
|
-
}
|
|
227
|
-
</style>
|
|
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
|
+
<p class="bg-info text-center" style="padding: 8px;">销售月报表</p>
|
|
6
|
+
<div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
|
|
7
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
|
|
8
|
+
<div class="row">
|
|
9
|
+
<div class="col-sm-4" >
|
|
10
|
+
<label class="font_normal_body" for="startDate">开始日期:</label>
|
|
11
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
12
|
+
v-model="model.startDate"
|
|
13
|
+
:value.sync="model.startDate"
|
|
14
|
+
:disabled-days-of-Week="[]"
|
|
15
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
16
|
+
:show-reset-button="reset">
|
|
17
|
+
</datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-4" >
|
|
20
|
+
<label class="font_normal_body" for="endDate">结束日期:</label>
|
|
21
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
22
|
+
v-model="model.endDate"
|
|
23
|
+
:value.sync="model.endDate"
|
|
24
|
+
:disabled-days-of-Week="[]"
|
|
25
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
26
|
+
:show-reset-button="reset">
|
|
27
|
+
</datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-4">
|
|
30
|
+
<label class="font_normal_body"> 公司 </label>
|
|
31
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
32
|
+
</div>
|
|
33
|
+
|
|
34
|
+
</div>
|
|
35
|
+
<div class="span" style = "float:right;">
|
|
36
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
37
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
38
|
+
<report-excel id='gasprice'></report-excel>
|
|
39
|
+
</div>
|
|
40
|
+
</div>
|
|
41
|
+
</criteria>
|
|
42
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
43
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
44
|
+
<thead>
|
|
45
|
+
<tr>
|
|
46
|
+
<th colspan='17' style="font-weight: normal; text-align: left;">
|
|
47
|
+
<h3 style="text-align: center">销售月报表</h3>
|
|
48
|
+
</th>
|
|
49
|
+
</tr>
|
|
50
|
+
<tr>
|
|
51
|
+
<th colspan='17' style="font-weight: normal; text-align: center;">
|
|
52
|
+
开始时间：{{model.model.startDate}}
|
|
53
|
+
结束时间：{{ model.model.endDate }}
|
|
54
|
+
</th>
|
|
55
|
+
</tr>
|
|
56
|
+
<tr>
|
|
57
|
+
<th colspan='17' style="font-weight: normal; text-align: center;">
|
|
58
|
+
打印时间：{{{$parent.printTime}}}
|
|
59
|
+
</th>
|
|
60
|
+
</tr>
|
|
61
|
+
<tr>
|
|
62
|
+
<th colspan='17' style="font-weight: normal; text-align: center;">
|
|
63
|
+
<div>
|
|
64
|
+
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
65
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
66
|
+
<span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
|
|
67
|
+
</div>
|
|
68
|
+
</th>
|
|
69
|
+
</tr>
|
|
70
|
+
</thead>
|
|
71
|
+
<tr>
|
|
72
|
+
<td colspan='17'>
|
|
73
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
74
|
+
</td>
|
|
75
|
+
</tr>
|
|
76
|
+
<tfoot>
|
|
77
|
+
<tr style="text-align: left">
|
|
78
|
+
<th colspan='6'>财务审核：</th>
|
|
79
|
+
<th colspan='6'>收款审核：</th>
|
|
80
|
+
<th colspan='5'>收款员：</th>
|
|
81
|
+
</tr>
|
|
82
|
+
</tfoot>
|
|
83
|
+
</table>
|
|
84
|
+
{{{ $parent.reportStr}}}
|
|
85
|
+
</div>
|
|
86
|
+
</criteria-paged>
|
|
87
|
+
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
88
|
+
<header slot="modal-header" class="modal-header">
|
|
89
|
+
<h4 class="modal-title">输入文件名称</h4>
|
|
90
|
+
</header>
|
|
91
|
+
<article slot="modal-body" class="modal-body">
|
|
92
|
+
<div class="form-group">
|
|
93
|
+
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
94
|
+
</div>
|
|
95
|
+
</article>
|
|
96
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
97
|
+
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
98
|
+
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
99
|
+
</footer>
|
|
100
|
+
</modal>
|
|
101
|
+
</div>
|
|
102
|
+
</template>
|
|
103
|
+
|
|
104
|
+
<script>
|
|
105
|
+
import { DataModel } from 'vue-client'
|
|
106
|
+
import co from 'co'
|
|
107
|
+
let saveFile = function * (self) {
|
|
108
|
+
// 线验证文件是否重名
|
|
109
|
+
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
110
|
+
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
111
|
+
{resolveMsg: null, rejectMsg: null})
|
|
112
|
+
if (count.data.length > 0) {
|
|
113
|
+
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
114
|
+
return
|
|
115
|
+
}
|
|
116
|
+
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
117
|
+
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
|
|
118
|
+
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
119
|
+
f_outlets: this.$login.f.depname})
|
|
120
|
+
if (saveBack.data.status === 'succeed') {
|
|
121
|
+
self.show = false
|
|
122
|
+
self.filename = ''
|
|
123
|
+
// 后台保存完成，通知刷新
|
|
124
|
+
self.$dispatch('save-success', self.filename)
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
export default {
|
|
128
|
+
title: '销售月报表',
|
|
129
|
+
props: ['data'],
|
|
130
|
+
data () {
|
|
131
|
+
return {
|
|
132
|
+
printTime: this.$login.toStandardTimeString(),
|
|
133
|
+
depresid: [],
|
|
134
|
+
userresid: [],
|
|
135
|
+
f_orgid: this.$login.f.orgid,
|
|
136
|
+
f_depid: this.$login.f.depids,
|
|
137
|
+
f_operatorid: this.$login.f.id,
|
|
138
|
+
operatorid: [],
|
|
139
|
+
depid: [],
|
|
140
|
+
orgname: '',
|
|
141
|
+
depname: '',
|
|
142
|
+
operatorname: '',
|
|
143
|
+
f_inputtor:[],
|
|
144
|
+
f_user_type:'',
|
|
145
|
+
orgCondtionStr: '1=1',
|
|
146
|
+
model: new DataModel('rs/report/saleMonthReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
147
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
148
|
+
reportStr: null,
|
|
149
|
+
show: false
|
|
150
|
+
}
|
|
151
|
+
},
|
|
152
|
+
ready () {
|
|
153
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
154
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
155
|
+
this.$refs.paged.$refs.criteria.search()
|
|
156
|
+
console.log(this.$login.f)
|
|
157
|
+
},
|
|
158
|
+
methods: {
|
|
159
|
+
searchData () {
|
|
160
|
+
this.$refs.paged.$refs.criteria.search()
|
|
161
|
+
},
|
|
162
|
+
selfSearch (args) {
|
|
163
|
+
let orgcondition = 'f_orgid in ( ' + this.f_orgid + ')'
|
|
164
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
165
|
+
this.$refs.paged.search(args)
|
|
166
|
+
},
|
|
167
|
+
getRes (obj) {
|
|
168
|
+
this.orgname = obj.res[0]
|
|
169
|
+
this.depresid = obj.resids
|
|
170
|
+
this.f_orgid = obj.resids
|
|
171
|
+
},
|
|
172
|
+
getdep (obj, val) {
|
|
173
|
+
// this.depname = val[0]
|
|
174
|
+
this.userresid = obj
|
|
175
|
+
this.f_depid = obj
|
|
176
|
+
},
|
|
177
|
+
getuser ( obj, val) {
|
|
178
|
+
this.operatorname = val[0]
|
|
179
|
+
this.f_operatorid = obj
|
|
180
|
+
},
|
|
181
|
+
// 根据文件路径获取储存的报表内容
|
|
182
|
+
getFileContent (path) {
|
|
183
|
+
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
184
|
+
this.reportStr = res.data.filecontent
|
|
185
|
+
this.model.state = '正确'
|
|
186
|
+
})
|
|
187
|
+
},
|
|
188
|
+
confirm () {
|
|
189
|
+
if (!this.filename || this.filename === '') {
|
|
190
|
+
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
191
|
+
}
|
|
192
|
+
let saveGen = saveFile(this)
|
|
193
|
+
co(saveGen)
|
|
194
|
+
},
|
|
195
|
+
close () {
|
|
196
|
+
this.show = false
|
|
197
|
+
},
|
|
198
|
+
// 将报表保存成文件
|
|
199
|
+
confirmReport () {
|
|
200
|
+
this.show = true
|
|
201
|
+
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
202
|
+
},
|
|
203
|
+
},
|
|
204
|
+
watch: {
|
|
205
|
+
'data' (val) {
|
|
206
|
+
if (val.f_files_path) {
|
|
207
|
+
this.getFileContent(val.f_files_path)
|
|
208
|
+
} else {
|
|
209
|
+
this.reportStr = null
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
},
|
|
213
|
+
computed: {
|
|
214
|
+
usertypes() {
|
|
215
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
216
|
+
},
|
|
217
|
+
inputtor() {
|
|
218
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
|
|
219
|
+
},
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
</script>
|
|
223
|
+
<style scoped>
|
|
224
|
+
.noborder{
|
|
225
|
+
border: none;
|
|
226
|
+
}
|
|
227
|
+
</style>
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
</div>
|
|
59
59
|
</criteria>
|
|
60
60
|
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
61
|
-
<table class='tableprint' style="margin: 0px auto"
|
|
61
|
+
<table class='tableprint' style="margin: 0px auto" >
|
|
62
62
|
<thead>
|
|
63
63
|
<tr>
|
|
64
64
|
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
|
|
@@ -103,9 +103,17 @@
|
|
|
103
103
|
<label class="font_normal_body">用户类型</label>
|
|
104
104
|
<v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
|
|
105
105
|
:options='$parent.$parent.usertypes' placeholder='请选择'
|
|
106
|
+
@change="$parent.$parent.userTypeChange()"
|
|
106
107
|
condition="f_user_type = '{}'"
|
|
107
108
|
close-on-select></v-select>
|
|
108
109
|
</div>
|
|
110
|
+
<div class="col-sm-2 form-group">
|
|
111
|
+
<label class="font_normal_body">用气性质</label>
|
|
112
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
113
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
114
|
+
condition="f_gasproperties = '{}'"
|
|
115
|
+
close-on-select></v-select>
|
|
116
|
+
</div>
|
|
109
117
|
</div>
|
|
110
118
|
|
|
111
119
|
</div>
|
|
@@ -297,7 +305,7 @@
|
|
|
297
305
|
},
|
|
298
306
|
showupload:false,
|
|
299
307
|
selected:{},
|
|
300
|
-
|
|
308
|
+
gasproperties:[],
|
|
301
309
|
//合计数据
|
|
302
310
|
sumsmodel: {}
|
|
303
311
|
}
|
|
@@ -424,6 +432,16 @@
|
|
|
424
432
|
await this.$MagLoadParams.loadParam(this.f_filialeid)
|
|
425
433
|
this.initParams()
|
|
426
434
|
},
|
|
435
|
+
userTypeChange () {
|
|
436
|
+
this.gasproperties=[]
|
|
437
|
+
if(this.$refs.paged.$refs.cri.model !==null) {
|
|
438
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties=''
|
|
439
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
440
|
+
}
|
|
441
|
+
else{
|
|
442
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
443
|
+
}
|
|
444
|
+
}
|
|
427
445
|
},
|
|
428
446
|
watch: {
|
|
429
447
|
'all'(val) {
|