manage-client 4.1.88 → 4.1.89
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
CHANGED
|
@@ -0,0 +1,200 @@
|
|
|
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'"
|
|
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'"
|
|
24
|
+
:show-reset-button="reset">
|
|
25
|
+
</datepicker>
|
|
26
|
+
</div>
|
|
27
|
+
<div class="col-sm-2 form-group">
|
|
28
|
+
<label class="font_normal_body">用户类型</label>
|
|
29
|
+
<v-select :value.sync="model.f_user_type"
|
|
30
|
+
v-model="model.f_user_type"
|
|
31
|
+
multiple
|
|
32
|
+
:options='$parent.$parent.user_type' placeholder='请选择'
|
|
33
|
+
condition="f_user_type in {}"
|
|
34
|
+
close-on-select></v-select>
|
|
35
|
+
</div>
|
|
36
|
+
<div class="col-sm-2 form-group">
|
|
37
|
+
<label class="font_normal_body">用气性质</label>
|
|
38
|
+
<v-select :value.sync="model.f_gasproperties"
|
|
39
|
+
v-model="model.f_gasproperties"
|
|
40
|
+
multiple
|
|
41
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
42
|
+
condition="f_gasproperties in {}"
|
|
43
|
+
close-on-select></v-select>
|
|
44
|
+
</div>
|
|
45
|
+
<res-select-group :show-component="$parent.$parent.resshow"
|
|
46
|
+
:selectin="true" :initres="$parent.$parent.initres"
|
|
47
|
+
:cascade =true @re-res="$parent.$parent.getRes"
|
|
48
|
+
v-ref:sel>
|
|
49
|
+
</res-select-group>
|
|
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='3cm' 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 }} <br/>
|
|
70
|
+
<!--收费员：{{// $parent.operatorname}}-->
|
|
71
|
+
</th>
|
|
72
|
+
</tr>
|
|
73
|
+
<tr >
|
|
74
|
+
<th v-if="false" :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
|
|
75
|
+
<div>
|
|
76
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
|
|
77
|
+
<span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
|
|
78
|
+
<span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
|
|
79
|
+
</div>
|
|
80
|
+
</th>
|
|
81
|
+
</tr>
|
|
82
|
+
</thead>
|
|
83
|
+
<tr>
|
|
84
|
+
<td :colspan='$parent.spans' class="noborder">
|
|
85
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
86
|
+
</td>
|
|
87
|
+
</tr>
|
|
88
|
+
<tfoot>
|
|
89
|
+
<tr style="text-align: left">
|
|
90
|
+
<th :colspan='Math.floor($parent.spans/3)'>报账人：</th>
|
|
91
|
+
<th :colspan='Math.floor($parent.spans/3)'>数据审核：</th>
|
|
92
|
+
<th :colspan='Math.floor($parent.spans/3)'>接收人：</th>
|
|
93
|
+
</tr>
|
|
94
|
+
</tfoot>
|
|
95
|
+
</table>
|
|
96
|
+
{{{ $parent.reportStr}}}
|
|
97
|
+
</div>
|
|
98
|
+
</criteria-paged>
|
|
99
|
+
</div>
|
|
100
|
+
</template>
|
|
101
|
+
|
|
102
|
+
<script>
|
|
103
|
+
import { DataModel } from 'vue-client'
|
|
104
|
+
import co from 'co'
|
|
105
|
+
export default {
|
|
106
|
+
title: '易家家报账单',
|
|
107
|
+
props: ['data'],
|
|
108
|
+
data () {
|
|
109
|
+
return {
|
|
110
|
+
printTime: this.$login.toStandardTimeString(),
|
|
111
|
+
depresid: [],
|
|
112
|
+
userresid: [],
|
|
113
|
+
f_orgid: this.$login.f.orgid,
|
|
114
|
+
f_depid: this.$login.f.depids,
|
|
115
|
+
// f_operatorid: this.$login.f.id,
|
|
116
|
+
operatorid: [],
|
|
117
|
+
depid: [],
|
|
118
|
+
orgname: '',
|
|
119
|
+
depname: '',
|
|
120
|
+
criteriaShow: false,
|
|
121
|
+
operatorname: '',
|
|
122
|
+
orgCondtionStr: '1=1',
|
|
123
|
+
f_user_type: '',
|
|
124
|
+
f_gasproperties: '',
|
|
125
|
+
f_state: ['有效'],
|
|
126
|
+
model: new DataModel('api/af-revenue/report/rh_yjj_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
127
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
128
|
+
reportStr: null,
|
|
129
|
+
resshow: ['company', 'department', 'operator'],
|
|
130
|
+
spans: 0,
|
|
131
|
+
initres: {
|
|
132
|
+
org: [this.$login.f.orgid],
|
|
133
|
+
dep: [],
|
|
134
|
+
user: []
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
ready () {
|
|
139
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
|
|
140
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
|
|
141
|
+
},
|
|
142
|
+
methods: {
|
|
143
|
+
searchData () {
|
|
144
|
+
this.$refs.paged.$refs.criteria.search()
|
|
145
|
+
},
|
|
146
|
+
selfSearch (args) {
|
|
147
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
148
|
+
let orgcondition = args.condition
|
|
149
|
+
let orgstr = this.orgCondtionStr
|
|
150
|
+
orgcondition = orgcondition + orgstr
|
|
151
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
152
|
+
this.$refs.paged.search(args)
|
|
153
|
+
},
|
|
154
|
+
|
|
155
|
+
hidden () {
|
|
156
|
+
this.criteriaShow = !this.criteriaShow
|
|
157
|
+
},
|
|
158
|
+
getRes (condition, obj) {
|
|
159
|
+
this.orgCondtionStr = condition
|
|
160
|
+
this.orgname = obj.orgnames[0]
|
|
161
|
+
this.depname = obj.depnames[0]
|
|
162
|
+
this.operatorname = obj.operatornames[0]
|
|
163
|
+
},
|
|
164
|
+
getdep (obj, val) {
|
|
165
|
+
this.depname = val[0]
|
|
166
|
+
this.userresid = obj
|
|
167
|
+
this.f_depid = obj
|
|
168
|
+
},
|
|
169
|
+
getuser ( obj, val) {
|
|
170
|
+
this.operatorname = val[0]
|
|
171
|
+
this.f_operatorid = obj
|
|
172
|
+
}
|
|
173
|
+
},
|
|
174
|
+
watch: {
|
|
175
|
+
'model.data' (val) {
|
|
176
|
+
let len=0
|
|
177
|
+
let a=val.split('</tr>')
|
|
178
|
+
for(let i=0;i<a.length;i++){
|
|
179
|
+
if(a[i].split('</td>').length-1>len){
|
|
180
|
+
len=a[i].split('</td>').length-1
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
this.spans = len
|
|
184
|
+
}
|
|
185
|
+
},
|
|
186
|
+
computed: {
|
|
187
|
+
user_type () {
|
|
188
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
189
|
+
},
|
|
190
|
+
gasproperties () {
|
|
191
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
</script>
|
|
196
|
+
<style scoped>
|
|
197
|
+
.noborder{
|
|
198
|
+
border: none;
|
|
199
|
+
}
|
|
200
|
+
</style>
|
|
@@ -469,9 +469,9 @@
|
|
|
469
469
|
let load = new HttpResetClass()
|
|
470
470
|
load.load('POST', 'api/af-revenue/sql/singleTableParam', {
|
|
471
471
|
data: {
|
|
472
|
-
items:'
|
|
472
|
+
items:'name',
|
|
473
473
|
tablename:'t_paramvalue',
|
|
474
|
-
condition:'processid in (select id from t_parameter where
|
|
474
|
+
condition:'processid in (select id from t_parameter where name='+ `'${this.$refs.paged.$refs.cri.model.f_error_level[0]}'` + ')'
|
|
475
475
|
}
|
|
476
476
|
},{warnMsg:null,resolveMsg:null}).then((res) => {
|
|
477
477
|
let i = 0
|
|
@@ -481,8 +481,8 @@
|
|
|
481
481
|
console.log("rows========",rows)
|
|
482
482
|
for (i = 0; i < rows.length; i++) {
|
|
483
483
|
let dr = {label: '全部', value: ''}
|
|
484
|
-
dr.label=rows[i].
|
|
485
|
-
dr.value=rows[i].
|
|
484
|
+
dr.label=rows[i].name
|
|
485
|
+
dr.value=rows[i].name
|
|
486
486
|
array1.push(dr)
|
|
487
487
|
console.log("rows[i]========",rows[i],dr)
|
|
488
488
|
}
|
package/src/reportManage.js
CHANGED
|
@@ -879,6 +879,10 @@ export default function () {
|
|
|
879
879
|
Vue.component('rh-kf-summary', (resolve) => {
|
|
880
880
|
require(['./components/SellReport/siyang/RHKFSummary'], resolve)
|
|
881
881
|
})
|
|
882
|
+
// 易家家报账单-收款方式自动循环
|
|
883
|
+
Vue.component('rh-yjj-summary', (resolve) => {
|
|
884
|
+
require(['./components/SellReport/siyang/RHYJJSummary'], resolve)
|
|
885
|
+
})
|
|
882
886
|
// 报表展示组件(收款日报表)
|
|
883
887
|
Vue.component('sy-bon-summary', (resolve) => {
|
|
884
888
|
require(['./components/SellReport/siyang/SYBonSummary'], resolve)
|