manage-client 3.2.21 → 3.2.22
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/QibiaoShouqi.vue +242 -282
- package/src/components/SellReport/UserSellingGas.vue +59 -8
- package/src/components/webmeter/newwebmeter/PriceInstructDetail.vue +374 -0
- package/src/components/webmeter/newwebmeter/PriceInstructList.vue +332 -0
- package/src/components/webmeter/newwebmeter/PriceInstructManage.vue +44 -0
- package/src/filiale/WEINAN/ReportDataQuery.vue +325 -276
- package/src/main.js +3 -3
- package/src/webmeterManage.js +6 -0
package/package.json
CHANGED
|
@@ -1,282 +1,242 @@
|
|
|
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
|
-
<
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
:
|
|
14
|
-
:
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
:
|
|
24
|
-
:
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
</div>
|
|
40
|
-
<div class="col-sm-
|
|
41
|
-
<label class="font_normal_body"
|
|
42
|
-
<
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
<
|
|
52
|
-
<report-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
<tr>
|
|
80
|
-
<
|
|
81
|
-
|
|
82
|
-
</
|
|
83
|
-
</tr>
|
|
84
|
-
<
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
</tr>
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
</
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
this.$refs.paged
|
|
199
|
-
},
|
|
200
|
-
|
|
201
|
-
this.
|
|
202
|
-
|
|
203
|
-
this
|
|
204
|
-
this
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
this.
|
|
209
|
-
this.
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
this
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
},
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
this.
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
if (val.f_files_path) {
|
|
244
|
-
this.getFileContent(val.f_files_path)
|
|
245
|
-
} else {
|
|
246
|
-
this.reportStr = null
|
|
247
|
-
}
|
|
248
|
-
},
|
|
249
|
-
'model.data' (val) {
|
|
250
|
-
let len=0
|
|
251
|
-
let a=val.split('</tr>')
|
|
252
|
-
for(let i=0;i<a.length;i++){
|
|
253
|
-
if(a[i].split('</td>').length-1>len){
|
|
254
|
-
len=a[i].split('</td>').length-1
|
|
255
|
-
}
|
|
256
|
-
continue
|
|
257
|
-
}
|
|
258
|
-
this.tablen=len
|
|
259
|
-
},
|
|
260
|
-
// '$refs.paged.$refs.criteria.model.f_meter_type' (val) {
|
|
261
|
-
// this.initParams()
|
|
262
|
-
// console.log('进入监听--------------------')
|
|
263
|
-
// }
|
|
264
|
-
},
|
|
265
|
-
computed: {
|
|
266
|
-
operator () {
|
|
267
|
-
return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
|
|
268
|
-
},
|
|
269
|
-
network () {
|
|
270
|
-
return this.$getParams('网点查询用', [{label: '全部', value: ''}])
|
|
271
|
-
},
|
|
272
|
-
metertypes() {
|
|
273
|
-
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
274
|
-
},
|
|
275
|
-
}
|
|
276
|
-
}
|
|
277
|
-
</script>
|
|
278
|
-
<style scoped>
|
|
279
|
-
.noborder{
|
|
280
|
-
border: none;
|
|
281
|
-
}
|
|
282
|
-
</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
|
+
<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
|
+
<div class="col-sm-2 form-group">
|
|
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 form-group">
|
|
32
|
+
<label class="font_normal_body" for="dep" >部  门:</label>
|
|
33
|
+
<res-select id="dep" restype='department' style="width: 60%"
|
|
34
|
+
is-mul="false"
|
|
35
|
+
@res-select="$parent.$parent.getdep"
|
|
36
|
+
:parentresid="$parent.$parent.depresid"
|
|
37
|
+
:initresid='$parent.$parent.depid' >
|
|
38
|
+
</res-select>
|
|
39
|
+
</div>
|
|
40
|
+
<div class="col-sm-2 form-group">
|
|
41
|
+
<label class="font_normal_body" for="oper">人  员:</label>
|
|
42
|
+
<res-select id="oper" restype='user' style="width: 60%"
|
|
43
|
+
is-mul="false"
|
|
44
|
+
@res-select="$parent.$parent.getuser"
|
|
45
|
+
:parentresid="$parent.$parent.userresid"
|
|
46
|
+
:initresid='$parent.$parent.operatorid'>
|
|
47
|
+
</res-select>
|
|
48
|
+
</div>
|
|
49
|
+
</div>
|
|
50
|
+
<div class="span" style = "float:right;">
|
|
51
|
+
<button class="button_search" @click="$parent.$parent.searchData()">查询</button>
|
|
52
|
+
<report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
|
|
53
|
+
<report-excel id='gasprice'></report-excel>
|
|
54
|
+
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
|
|
55
|
+
'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
58
|
+
<div class="col-sm-2 form-group">
|
|
59
|
+
<label class="font_normal_body">气表类型</label>
|
|
60
|
+
<v-select :value.sync="model.f_meter_type" multiple
|
|
61
|
+
:options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
|
|
62
|
+
condition="f_meter_classify in {}"
|
|
63
|
+
close-on-select></v-select>
|
|
64
|
+
</div>
|
|
65
|
+
<div class="col-sm-2 form-group">
|
|
66
|
+
<label class="font_normal_body">气表品牌</label>
|
|
67
|
+
<v-select :value.sync="model.f_meter_brand"
|
|
68
|
+
v-model="model.f_meter_brand"
|
|
69
|
+
:options='$parent.$parent.meterbrands' placeholder='请选择'
|
|
70
|
+
condition="f_meter_brand = '{}'"
|
|
71
|
+
close-on-select></v-select>
|
|
72
|
+
</div>
|
|
73
|
+
</div>
|
|
74
|
+
</div>
|
|
75
|
+
</criteria>
|
|
76
|
+
<div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
|
|
77
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
78
|
+
<thead>
|
|
79
|
+
<tr>
|
|
80
|
+
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
|
|
81
|
+
<h3 style="text-align: center">气表售气量</h3>
|
|
82
|
+
</th>
|
|
83
|
+
</tr>
|
|
84
|
+
<tr>
|
|
85
|
+
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
|
|
86
|
+
时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
|
|
87
|
+
打印时间：{{{$parent.printTime}}}
|
|
88
|
+
</th>
|
|
89
|
+
</tr>
|
|
90
|
+
<tr>
|
|
91
|
+
<th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
|
|
92
|
+
<div>
|
|
93
|
+
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
94
|
+
</div>
|
|
95
|
+
</th>
|
|
96
|
+
</tr>
|
|
97
|
+
</thead>
|
|
98
|
+
<tr>
|
|
99
|
+
<td :colspan='$parent.tablen' style="border-style: none;">
|
|
100
|
+
{{{ model.data.replace(' ',' style="border-collapse:collapse; border:none;border: solid #000 2px;" ') }}}
|
|
101
|
+
</td>
|
|
102
|
+
</tr>
|
|
103
|
+
<tfoot>
|
|
104
|
+
<tr style="text-align: left">
|
|
105
|
+
<th :colspan='$parent.tablen/3'>财务审核：</th>
|
|
106
|
+
<th :colspan='$parent.tablen/3'>收款审核：</th>
|
|
107
|
+
<th :colspan='$parent.tablen/3'>收款员：</th>
|
|
108
|
+
</tr>
|
|
109
|
+
</tfoot>
|
|
110
|
+
</table>
|
|
111
|
+
</div>
|
|
112
|
+
</criteria-paged>
|
|
113
|
+
</div>
|
|
114
|
+
</template>
|
|
115
|
+
|
|
116
|
+
<script>
|
|
117
|
+
import {DataModel, HttpResetClass} from 'vue-client'
|
|
118
|
+
import co from 'co'
|
|
119
|
+
|
|
120
|
+
export default {
|
|
121
|
+
title: '气表售气量',
|
|
122
|
+
props: ['data'],
|
|
123
|
+
data () {
|
|
124
|
+
return {
|
|
125
|
+
printTime: this.$login.toStandardTimeString(),
|
|
126
|
+
depresid: [],
|
|
127
|
+
userresid: [],
|
|
128
|
+
f_orgid: this.$login.f.orgid,
|
|
129
|
+
f_depid: this.$login.f.depids,
|
|
130
|
+
f_operatorid: this.$login.f.id,
|
|
131
|
+
operatorid: [],
|
|
132
|
+
depid: [],
|
|
133
|
+
tablen:0,
|
|
134
|
+
orgname: '',
|
|
135
|
+
depname: '',
|
|
136
|
+
operatorname: '',
|
|
137
|
+
orgCondtionStr: '1=1',
|
|
138
|
+
model: new DataModel('rs/report/qibiao-shouqi', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
139
|
+
f_orgid: 'this.model.f_orgid'}),
|
|
140
|
+
reportStr: null,
|
|
141
|
+
criteriaShow: false,
|
|
142
|
+
// 下拉框
|
|
143
|
+
meterbrands: [],
|
|
144
|
+
show: false,
|
|
145
|
+
}
|
|
146
|
+
},
|
|
147
|
+
ready () {
|
|
148
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
149
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
150
|
+
console.log(this.$login.f)
|
|
151
|
+
// let brandArr = []
|
|
152
|
+
// this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
153
|
+
// let temp = {}
|
|
154
|
+
// temp.label = item.label
|
|
155
|
+
// temp.value = item.value.f_meter_brand
|
|
156
|
+
// brandArr.push(temp)
|
|
157
|
+
// })
|
|
158
|
+
// this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
159
|
+
this.initParams()
|
|
160
|
+
},
|
|
161
|
+
methods: {
|
|
162
|
+
async initParams (condition) {
|
|
163
|
+
// 初始化气表品牌
|
|
164
|
+
let HttpReset = new HttpResetClass()
|
|
165
|
+
let yy=this.$refs.paged.$refs.criteria.model.f_meter_type
|
|
166
|
+
var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
|
|
167
|
+
data: {
|
|
168
|
+
condition: '1=1 and f_orgid in(' + this.f_orgid + ')' + (condition==null ? '' : condition),
|
|
169
|
+
tablename: 't_gasbrand',
|
|
170
|
+
groupitem: 'f_meter_brand',
|
|
171
|
+
orderitem: 'f_meter_brand',
|
|
172
|
+
items: 'f_meter_brand'
|
|
173
|
+
}
|
|
174
|
+
}, {resolveMsg: null, rejectMsg: '获取气表品牌失败!'})
|
|
175
|
+
console.log('气表品牌-->',data)
|
|
176
|
+
let brandArr = [{label: '全部', value: ''}]
|
|
177
|
+
for (let row of data.data){
|
|
178
|
+
brandArr.push({label: row.f_meter_brand, value: row.f_meter_brand})
|
|
179
|
+
}
|
|
180
|
+
this.meterbrands = brandArr
|
|
181
|
+
},
|
|
182
|
+
searchData () {
|
|
183
|
+
this.$refs.paged.$refs.criteria.search()
|
|
184
|
+
},
|
|
185
|
+
selfSearch (args) {
|
|
186
|
+
this.printTime = this.$login.toStandardTimeString()
|
|
187
|
+
let orgcondition = '1=1'
|
|
188
|
+
if(this.f_orgid && this.f_orgid[0]) {
|
|
189
|
+
orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
|
|
190
|
+
}
|
|
191
|
+
if (this.f_depid && this.f_depid[0]) {
|
|
192
|
+
orgcondition += ' and f_depid in (' + this.f_depid + ')'
|
|
193
|
+
}
|
|
194
|
+
if(this.f_operatorid && this.f_operatorid[0]) {
|
|
195
|
+
orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
|
|
196
|
+
}
|
|
197
|
+
this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
|
|
198
|
+
this.$refs.paged.search(args)
|
|
199
|
+
},
|
|
200
|
+
getRes (obj) {
|
|
201
|
+
this.orgname = obj.res[0]
|
|
202
|
+
this.f_orgid = obj.resids
|
|
203
|
+
this.depresid = obj.resids
|
|
204
|
+
this.userresid = obj.resids
|
|
205
|
+
this.initParams()
|
|
206
|
+
},
|
|
207
|
+
getdep (obj, val) {
|
|
208
|
+
this.depname = val[0]
|
|
209
|
+
// this.userresid = obj
|
|
210
|
+
this.f_depid = obj
|
|
211
|
+
},
|
|
212
|
+
getuser ( obj, val) {
|
|
213
|
+
this.operatorname = val[0]
|
|
214
|
+
this.f_operatorid = obj
|
|
215
|
+
},
|
|
216
|
+
show() {
|
|
217
|
+
this.criteriaShow = true
|
|
218
|
+
},
|
|
219
|
+
hidden() {
|
|
220
|
+
this.criteriaShow = !this.criteriaShow
|
|
221
|
+
},
|
|
222
|
+
close () {
|
|
223
|
+
this.show = false
|
|
224
|
+
}
|
|
225
|
+
},
|
|
226
|
+
watch: {
|
|
227
|
+
'model.data' (val) {
|
|
228
|
+
this.tablen = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
|
|
229
|
+
}
|
|
230
|
+
},
|
|
231
|
+
computed: {
|
|
232
|
+
metertypes() {
|
|
233
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
</script>
|
|
238
|
+
<style scoped>
|
|
239
|
+
.noborder{
|
|
240
|
+
border: none;
|
|
241
|
+
}
|
|
242
|
+
</style>
|