manage-client 3.2.54-aode → 3.2.55-aode

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.
Files changed (7) hide show
  1. package/build/dev-server.js +9 -0
  2. package/package.json +1 -1
  3. package/src/components/sale/report/aode/DayReportList.vue +3 -3
  4. package/src/components/sale/report/aode/MonthByChargeType.vue +526 -526
  5. package/src/components/sale/report/aode/MonthByUserType.vue +3 -3
  6. package/src/components/sale/report/aode/YearByChargeTpye.vue +3 -3
  7. package/src/components/sale/report/aode/YearByUserType.vue +3 -3
package/build/dev-server.js CHANGED
@@ -22,6 +22,15 @@ var proxyTable = {
22
22
  '/rs/logic/exportfile': {
23
23
  target: fuwu
24
24
  },
25
+ '/rs/sql/aode_YearByChargeType':{
26
+ target:fuwu+"/staticpage/yearbychargetype/"
27
+ },
28
+ '/rs/sql/aode_YearByUserType':{
29
+ target:fuwu+"/staticpage/yearbyusertype/"
30
+ },
31
+ '/rs/sql/aode_monthByChargeType':{
32
+ target:fuwu+"/staticpage/monthbychargetype/"
33
+ },
25
34
  '/files': {
26
35
  target: fuwu
27
36
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.54-aode",
3
+ "version": "3.2.55-aode",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/report/aode/DayReportList.vue CHANGED
@@ -54,7 +54,7 @@
54
54
  <label class="font_normal_body">包含APP</label>
55
55
  <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
56
56
  :options='$parent.$parent.hasapps' placeholder='请选择'
57
- condition="f_operator {} "
57
+ condition=" {} "
58
58
  close-on-select></v-select>
59
59
  </div>
60
60
 
@@ -275,7 +275,7 @@
275
275
  criteriaShow: false,
276
276
  operates: [{label: '全部', value: ''},...this.$appdata.getParam('日清单操作类型')],
277
277
  stateoptions:[{label: '全部', value: ''}, {label: '有效', value: "有效"},{label: '撤销', value: "撤销"},{label: '无效', value: "无效"},{label: '冲正', value: "冲正"}],
278
- hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
278
+ hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
279
279
  useroptions:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
280
280
  selectfields:[],
281
281
  pushncshow:false,
@@ -291,7 +291,7 @@
291
291
  this.pushncshow = true;
292
292
  }
293
293
  this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
294
- this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
294
+ this.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
295
295
  this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString() +' 00:00:00'
296
296
  this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
297
297
  for(var item in exportConfig.dataReportConfig){
package/src/components/sale/report/aode/MonthByChargeType.vue CHANGED
@@ -1,526 +1,526 @@
1
- <template>
2
- <div id="unit" class="flex-row">
3
- <div class="basic-main">
4
- <div class="flex">
5
- <criteria-paged :model="model" v-ref:paged>
6
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
7
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
- <div class="row">
9
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" v-ref:sel></res-select-group>
10
- <div class="col-sm-2 form-group">
11
- <label class="font_normal_body">时间类型</label>
12
- <v-select
13
- :value.sync="$parent.$parent.typeInfo" v-model="$parent.$parent.typeInfo"
14
- :options='$parent.$parent.DateType' placeholder='选择月份' close-on-select
15
- @change="$parent.$parent.ThePolesReverse()"
16
- >
17
- </v-select>
18
- </div>
19
- <div class="col-sm-2 form-group">
20
- <label class="font_normal_body">包含APP</label>
21
- <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
22
- :options='$parent.$parent.hasapps' placeholder='请选择'
23
- condition="f_operator {} "
24
- close-on-select></v-select>
25
- </div>
26
- </div>
27
- <div class="row">
28
- <div class="col-sm-2 form-group" v-show="$parent.$parent.oneShow">
29
- <label for="YeanMouthDate" class="font_normal_body" >统计月份</label>
30
- <datepicker placeholder="统计月份" style="width:60%"
31
- v-model="model.YeanMouthDate"
32
- :value.sync="model.YeanMouthDate"
33
- :format="'yyyy-MM'"
34
- :show-reset-button="true"
35
- :select-month="true">
36
- </datepicker>
37
- </div>
38
- <div class="col-sm-2 form-group" v-show="!$parent.$parent.oneShow">
39
- <label for="endDate" class="font_normal_body">开始时间</label>
40
- <datepicker placeholder="开始时间" style="width:60%"
41
- v-model="model.f_begin_operate_date"
42
- :value.sync="model.f_begin_operate_date"
43
- :format="'yyyy-MM-dd'"
44
- :show-reset-button="true"
45
-
46
- >
47
- </datepicker>
48
- </div>
49
- <div class="col-sm-2 form-group" v-show="!$parent.$parent.oneShow">
50
- <label for="endDate" class="font_normal_body">结束时间</label>
51
- <datepicker placeholder="结束时间" style="width:60%"
52
- v-model="model.f_end_operate_date"
53
- :value.sync="model.f_end_operate_date"
54
- :format="'yyyy-MM-dd'"
55
- :show-reset-button="true"
56
- >
57
- </datepicker>
58
- </div>
59
- <div class="span" style="float:right;margin-top:10px">
60
- <button class="button_search button_spacing" @click="search()">查询</button>
61
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
62
-
63
- <export-excel-hand :data="$parent.$parent.getCondition" class="button_export button_spacing"
64
- :other-data="$parent.$parent.other"
65
- :footer-data="$parent.$parent.footer" v-ref:exports
66
- :defaultselect="$parent.$parent.selectfields"
67
- :field="$parent.$parent.getfield" :sumname="$parent.$parent.sumName"
68
- sqlurl="rs/logic/reportExportfile" sql-name="aode_monthByChargeType" template-name='月报（缴费类型）'
69
- :choose-col="true"></export-excel-hand>
70
-
71
- <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
72
- <!--:defaultfield="$parent.$parent.defaultfield" print-name="月报（缴费类型）"></print-data>-->
73
- <month-by-charge-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></month-by-charge-print>
74
-
75
- </div>
76
- </div>
77
- </div>
78
- </criteria>
79
- <data-grid :model="model" :sumsmodel="sumsmodel" partial='list' class="list_area table_sy" @dblclick="$parent.dblclick" v-ref:grid>
80
- <template partial='head'>
81
- <tr>
82
- <th>
83
- <nobr>购买日期</nobr>
84
- </th>
85
- <th>
86
- <nobr>开户人次</nobr>
87
- </th>
88
- <th>
89
- <nobr>开户气量</nobr>
90
- </th>
91
- <th>
92
- <nobr>开户金额</nobr>
93
- </th>
94
- <th>
95
- <nobr>再购人次</nobr>
96
- </th>
97
- <th>
98
- <nobr>再购气量</nobr>
99
- </th>
100
- <th>
101
- <nobr>再购金额</nobr>
102
- </th>
103
- <th>
104
- <nobr>补卡人次</nobr>
105
- </th>
106
- <th>
107
- <nobr>补卡金额</nobr>
108
- </th>
109
- <th>
110
- <nobr>补气人次</nobr>
111
- </th>
112
- <th>
113
- <nobr>补气气量</nobr>
114
- </th>
115
- <th>
116
- <nobr>补气金额</nobr>
117
- </th>
118
- <th>
119
- <nobr>换表人次</nobr>
120
- </th>
121
- <th>
122
- <nobr>柜台微信</nobr>
123
- </th>
124
- <th>
125
- <nobr>财务收款</nobr>
126
- </th>
127
- <th>
128
- <nobr>现金缴费</nobr>
129
- </th>
130
- <th>
131
- <nobr>柜台支付宝</nobr>
132
- </th>
133
- <th>
134
- <nobr>P&nbsp;O&nbsp;S</nobr>
135
- </th>
136
- <th>
137
- <nobr>换表金额</nobr>
138
- </th>
139
- <th>
140
- <nobr>合计人次</nobr>
141
- </th>
142
- <th>
143
- <nobr>合计气量</nobr>
144
- </th>
145
- <th>
146
- <nobr>合计金额</nobr>
147
- </th>
148
- </tr>
149
- </template>
150
- <template partial='body'>
151
- <td style="text-align: center;">
152
- <nobr>{{row.f_operate_date}}</nobr>
153
- </td>
154
- <td style="text-align: center;">
155
- <nobr>{{row.f_count_open}}</nobr>
156
- </td>
157
- <td style="text-align: center;">
158
- <nobr>{{row.f_pregas_open}}</nobr>
159
- </td>
160
- <td style="text-align: center;">
161
- <nobr>{{row.f_collection_open}}</nobr>
162
- </td>
163
- <td style="text-align: center;">
164
- <nobr>{{row.f_count_zg}}</nobr>
165
- </td>
166
- <td style="text-align: center;">
167
- <nobr>{{row.f_pregas_zg}}</nobr>
168
- </td>
169
- <td style="text-align: center;">
170
- <nobr>{{row.f_collection_zg}}</nobr>
171
- </td>
172
- <td style="text-align: center;">
173
- <nobr>{{row.f_count_bk}}</nobr>
174
- </td>
175
- <td style="text-align: center;">
176
- <nobr>{{row.f_collection_bk}}</nobr>
177
- </td>
178
- <td style="text-align: center;">
179
- <nobr>{{row.f_count_bq}}</nobr>
180
- </td>
181
- <td style="text-align: center;">
182
- <nobr>{{row.f_pregas_bq}}</nobr>
183
- </td>
184
- <td style="text-align: center;">
185
- <nobr>{{row.f_collection_bq}}</nobr>
186
- </td>
187
- <td style="text-align: center;">
188
- <nobr>{{row.f_count_hb}}</nobr>
189
- </td>
190
- <td style="text-align: center;">
191
- <nobr>{{row.f_payment =='柜台微信'? row.f_collection:0}}</nobr>
192
- </td>
193
- <td style="text-align: center;">
194
- <nobr>{{row.f_payment =='财务收款'? row.f_collection:0}}</nobr>
195
- </td>
196
- <td style="text-align: center;">
197
- <nobr>{{row.f_payment =='现金缴费'? row.f_collection:0}}</nobr>
198
- </td>
199
- <td style="text-align: center;">
200
- <nobr>{{row.f_payment =='柜台支付宝'? row.f_collection:0}}</nobr>
201
- </td>
202
- <td style="text-align: center;">
203
- <nobr>{{row.f_payment =='pos'? row.f_collection:0}}</nobr>
204
- </td>
205
- <td style="text-align: center;">
206
- <nobr>{{row.f_collection_hb}}</nobr>
207
- </td>
208
- <td style="text-align: center;">
209
- <nobr>{{row.f_count}}</nobr>
210
- </td>
211
- <td style="text-align: center;">
212
- <nobr>{{row.f_pregas}}</nobr>
213
- </td>
214
- <td style="text-align: center;">
215
- <nobr>{{row.f_collection}}</nobr>
216
- </td>
217
- </template>
218
- <template partial='foot'>
219
- <td style="text-align: center;background-color: mistyrose">
220
- <nobr>合计：</nobr>
221
- </td>
222
- <td style="text-align: center;background-color: mistyrose">
223
- <nobr>{{model.sums.f_count_open}}</nobr>
224
- </td>
225
- <td style="text-align: center;background-color: mistyrose">
226
- <nobr>{{model.sums.f_pregas_open}}</nobr>
227
- </td>
228
- <td style="text-align: center;background-color: mistyrose">
229
- <nobr>{{model.sums.f_collection_open}}</nobr>
230
- </td>
231
- <td style="text-align: center;background-color: mistyrose">
232
- <nobr>{{model.sums.f_count_zg}}</nobr>
233
- </td>
234
- <td style="text-align: center;background-color: mistyrose">
235
- <nobr>{{model.sums.f_pregas_zg}}</nobr>
236
- </td>
237
- <td style="text-align: center;background-color: mistyrose">
238
- <nobr>{{model.sums.f_collection_zg}}</nobr>
239
- </td>
240
- <td style="text-align: center;background-color: mistyrose">
241
- <nobr>{{model.sums.f_count_bk}}</nobr>
242
- </td>
243
- <td style="text-align: center;background-color: mistyrose">
244
- <nobr>{{model.sums.f_collection_bk}}</nobr>
245
- </td>
246
- <td style="text-align: center;background-color: mistyrose">
247
- <nobr>{{model.sums.f_count_bq}}</nobr>
248
- </td>
249
- <td style="text-align: center;background-color: mistyrose">
250
- <nobr>{{model.sums.f_pregas_bq}}</nobr>
251
- </td>
252
- <td style="text-align: center;background-color: mistyrose">
253
- <nobr>{{model.sums.f_collection_bq}}</nobr>
254
- </td>
255
- <td style="text-align: center;background-color: mistyrose">
256
- <nobr>{{model.sums.f_count_hb}}</nobr>
257
- </td>
258
- <td style="text-align: center;background-color: mistyrose">
259
- <nobr>{{row.f_payment =='柜台微信'? row.f_collection:0}}</nobr>
260
- </td>
261
- <td style="text-align: center;background-color: mistyrose">
262
- <nobr>{{row.f_payment =='财务收款'? row.f_collection:0}}</nobr>
263
- </td>
264
- <td style="text-align: center;background-color: mistyrose">
265
- <nobr>{{row.f_payment =='现金缴费'? row.f_collection:0}}</nobr>
266
- </td>
267
- <td style="text-align: center;background-color: mistyrose">
268
- <nobr>{{row.f_payment =='柜台支付宝'? row.f_collection:0}}</nobr>
269
- </td>
270
- <td style="text-align: center;background-color: mistyrose">
271
- <nobr>{{row.f_payment =='pos'? row.f_collection:0}}</nobr>
272
- </td>
273
- <td style="text-align: center;background-color: mistyrose">
274
- <nobr>{{model.sums.f_collection_hb}}</nobr>
275
- </td>
276
- <td style="text-align: center;background-color: mistyrose">
277
- <nobr>{{model.sums.f_count}}</nobr>
278
- </td>
279
- <td style="text-align: center;background-color: mistyrose">
280
- <nobr>{{model.sums.f_pregas}}</nobr>
281
- </td>
282
- <td style="text-align: center;background-color: mistyrose">
283
- <nobr>{{model.sums.f_collection}}</nobr>
284
- </td>
285
- </template>
286
- </data-grid>
287
- </criteria-paged>
288
- </div>
289
- </div>
290
- </template>
291
-
292
- <script>
293
- import {PagedList} from 'vue-client'
294
- // import defaultPrint from '../config/DefaultPrint'
295
- import exportConfig from '../../config/exportConfig'
296
-
297
- let readySomething = async function (self) {
298
- self.$refs.paged.$refs.cri.model.f_operate_date = self.$login.toStandardYearMonth()
299
- self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
300
- // await self.$refs.paged.$refs.cri.search()
301
- // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
302
- }
303
-
304
- export default {
305
- title: '月报（缴费类型）',
306
- data() {
307
- return {
308
- other:[],
309
- footer:[],
310
- model: new PagedList('rs/sql/aode_monthByChargeType', 35, {YeanMouthDate: 'this.model.YeanMouthDate',f_begin_operate_date: 'this.model.f_begin_operate_date',f_end_operate_date: 'this.model.f_end_operate_date'}, {
311
- f_count_open:0,
312
- f_pregas_open:0,
313
- f_collection_open:0,
314
- f_count_zg:0,
315
- f_pregas_zg:0,
316
- f_collection_zg:0,
317
- f_count_bk:0,
318
- f_collection_bk:0,
319
- f_count_bq:0,
320
- f_pregas_bq:0,
321
- f_collection_bq:0,
322
- f_count_hb:0,
323
- f_collection_hb:0,
324
- f_count: 0,
325
- f_pregas: 0,
326
- f_collection: 0
327
- }),
328
- initres: {
329
- org:[this.$login.f.orgid],
330
- dep:[this.$login.f.depids],
331
- user:[this.$login.f.id]
332
- },
333
- oneShow: true,
334
- typeInfo: '选择月份',
335
- DateType:[{label:'选择月份',value:'选择月份'},{label:'选择区间',value:'选择区间'}],
336
- hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
337
- criteriaShow: true,
338
- orgCondtionStr: '',
339
- sumsmodel: {},
340
- orgname: '',
341
- depname: '',
342
- sumName:[
343
- 'f_count_open','f_pregas_open','f_collection_open',
344
- 'f_count_zg', 'f_pregas_zg','f_collection_zg',
345
- 'f_count_bk', 'f_collection_bk',
346
- ' f_count_bq', 'f_pregas_bq','f_collection_bq',
347
- 'f_count_hb', 'f_collection_bk',
348
- 'f_count','f_pregas','f_collection'
349
- ],
350
- selectfields:[]
351
- }
352
- },
353
- ready() {
354
- readySomething(this).then(() => {
355
- this.$emit('ready')
356
- }).catch((error) => {
357
- this.$emit('error', error)
358
- })
359
- for(var item in exportConfig.dataReportConfig){
360
- this.selectfields.push(item)
361
- }
362
- },
363
- methods: {
364
- getotherfooter(){
365
- this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
366
- this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
367
- this.other=[];
368
- this.footer=[];
369
- let exportdata = this.getCondition;
370
- let otherInData=[];
371
-
372
- otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
373
- otherInData.push(`导出人：${this.$login.f.name}`)
374
- let footerData=[],exportfield=this.getfield;
375
- footerData.push("合计");
376
- let self = this;
377
- for(var field in self.sumsmodel){
378
- footerData.push(`${self.sumsmodel[field]}`);
379
- }
380
- this.footer.push(footerData);
381
- this.other.push(otherInData);
382
- },
383
- async selfSearch(args) {
384
- let f_orgstr = this.orgCondtionStr
385
- if (!this.orgCondtionStr) {
386
- f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
387
- }
388
- args.condition = `${args.condition} ` + f_orgstr
389
- await this.model.search(args.condition, args.model)
390
-
391
- this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
392
- console.log('计算合计。', this.sumsmodel)
393
- if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
394
- for (let key in this.sumsmodel) {
395
- this.sumsmodel[key] = 0
396
- }
397
- }
398
- this.$dispatch('getdata', this.sumsmodel)
399
- },
400
- ThePolesReverse(){
401
- if(this.typeInfo[0] === '选择月份'){
402
- this.$refs.paged.$refs.cri.model.f_begin_operate_date =''
403
- this.$refs.paged.$refs.cri.model.f_end_operate_date =''
404
- this.$refs.paged.$refs.cri.model.YeanMouthDate = this.$login.toStandardYearMonth()
405
- this.oneShow =true
406
- }else{
407
- this.$refs.paged.$refs.cri.model.YeanMouthDate =''
408
- this.$refs.paged.$refs.cri.model.f_begin_operate_date = this.$login.toStandardDateString()
409
- this.$refs.paged.$refs.cri.model.f_end_operate_date = this.$login.toStandardDateString()
410
- this.oneShow =false
411
- }
412
- },
413
- clear() {
414
- //清空部门和人员
415
- this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
416
- //部门和人员变为全选
417
- this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
418
- this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
419
- Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
420
- this.$refs.paged.$refs.cri.model[key] = ''
421
- })
422
- },
423
- show() {
424
- this.criteriaShow = true
425
- },
426
- hidden() {
427
- this.criteriaShow = false
428
- },
429
- getRes(condition,obj) {
430
- this.orgCondtionStr = condition
431
- this.orgname = obj.orgnames[0]
432
- this.depname = obj.depnames[0]
433
- },
434
- stamp() {
435
- this.all = false
436
- //默认选择要打印的列
437
- this.modelval = defaultPrint.config
438
- this.fields = this.getfield
439
- console.log('所有打印字段', this.fields)
440
- this.printshow = true
441
- this.put()
442
- },
443
- put() {
444
- // 对Modelval进行排序
445
- console.log("put======================================================================")
446
- this.sortModelval()
447
- this.thead = `<tr><th colspan=${this.modelval.length}>客户查询统计报表</th></tr><tr>`
448
- for (let key of this.modelval) {
449
- this.thead += '<th>' + this.fields[key] + '</th>'
450
- }
451
- this.thead += '</tr>'
452
- },
453
- print() {
454
- this.$refs.print.PrintAsFile()
455
- this.printshow = false
456
- },
457
- close() {
458
- this.printshow = false
459
- },
460
- // 对选择的列进行排序
461
- sortModelval() {
462
- let sortModel = []
463
- Object.keys(this.fields).forEach((key) => {
464
- if (this.modelval.includes(key)) {
465
- sortModel.push(key)
466
- }
467
- })
468
- this.modelval = sortModel
469
- console.log('选择的打印的字段', this.modelval)
470
- }
471
- },
472
- watch: {
473
- 'all'(val) {
474
- if (val) {
475
- this.modelval = this.bodyData
476
- } else {
477
- this.modelval = defaultPrint.config
478
- this.put()
479
- }
480
- },
481
- 'modelval.length'() {
482
- this.put()
483
- },
484
- sumsmodel:{
485
- handler: function(val) {
486
- this.getotherfooter();
487
- },
488
- deep: true
489
- }
490
- },
491
- computed: {
492
- getCondition() {
493
- return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,f_operate_date:`${this.$refs.paged.$refs.cri.model.f_operate_date}`
494
- ,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` ,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`,
495
- YeanMouthDate:`${this.$refs.paged.$refs.cri.model.YeanMouthDate}`}
496
- },
497
- getfield() {
498
- return exportConfig.monthByChargeConfig
499
- },
500
- userstates() {
501
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
502
- },
503
- sliceArea() {
504
- let rs = new Array()
505
- for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
506
- let temp = {
507
- label: this.$login.f.f_allArea[i].label,
508
- value: this.$login.f.f_allArea[i].label
509
- }
510
- rs.push(temp)
511
- }
512
- return [{label: '全部', value: ''}, ...rs]
513
- }
514
- }
515
- }
516
- </script>
517
-
518
- <style>
519
- .datapanel {
520
- color: #333;
521
- background-color: white;
522
- box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
523
- padding: 10px 10px 5px 10px;
524
- border-radius: 10px;
525
- }
526
- </style>
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main">
4
+ <div class="flex">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row">
9
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" v-ref:sel></res-select-group>
10
+ <div class="col-sm-2 form-group">
11
+ <label class="font_normal_body">时间类型</label>
12
+ <v-select
13
+ :value.sync="$parent.$parent.typeInfo" v-model="$parent.$parent.typeInfo"
14
+ :options='$parent.$parent.DateType' placeholder='选择月份' close-on-select
15
+ @change="$parent.$parent.ThePolesReverse()"
16
+ >
17
+ </v-select>
18
+ </div>
19
+ <div class="col-sm-2 form-group">
20
+ <label class="font_normal_body">包含APP</label>
21
+ <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
22
+ :options='$parent.$parent.hasapps' placeholder='请选择'
23
+ condition="{} "
24
+ close-on-select></v-select>
25
+ </div>
26
+ </div>
27
+ <div class="row">
28
+ <div class="col-sm-2 form-group" v-show="$parent.$parent.oneShow">
29
+ <label for="YeanMouthDate" class="font_normal_body" >统计月份</label>
30
+ <datepicker placeholder="统计月份" style="width:60%"
31
+ v-model="model.YeanMouthDate"
32
+ :value.sync="model.YeanMouthDate"
33
+ :format="'yyyy-MM'"
34
+ :show-reset-button="true"
35
+ :select-month="true">
36
+ </datepicker>
37
+ </div>
38
+ <div class="col-sm-2 form-group" v-show="!$parent.$parent.oneShow">
39
+ <label for="endDate" class="font_normal_body">开始时间</label>
40
+ <datepicker placeholder="开始时间" style="width:60%"
41
+ v-model="model.f_begin_operate_date"
42
+ :value.sync="model.f_begin_operate_date"
43
+ :format="'yyyy-MM-dd'"
44
+ :show-reset-button="true"
45
+
46
+ >
47
+ </datepicker>
48
+ </div>
49
+ <div class="col-sm-2 form-group" v-show="!$parent.$parent.oneShow">
50
+ <label for="endDate" class="font_normal_body">结束时间</label>
51
+ <datepicker placeholder="结束时间" style="width:60%"
52
+ v-model="model.f_end_operate_date"
53
+ :value.sync="model.f_end_operate_date"
54
+ :format="'yyyy-MM-dd'"
55
+ :show-reset-button="true"
56
+ >
57
+ </datepicker>
58
+ </div>
59
+ <div class="span" style="float:right;margin-top:10px">
60
+ <button class="button_search button_spacing" @click="search()">查询</button>
61
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
62
+
63
+ <export-excel-hand :data="$parent.$parent.getCondition" class="button_export button_spacing"
64
+ :other-data="$parent.$parent.other"
65
+ :footer-data="$parent.$parent.footer" v-ref:exports
66
+ :defaultselect="$parent.$parent.selectfields"
67
+ :field="$parent.$parent.getfield" :sumname="$parent.$parent.sumName"
68
+ sqlurl="rs/logic/reportExportfile" sql-name="aode_monthByChargeType" template-name='月报（缴费类型）'
69
+ :choose-col="true"></export-excel-hand>
70
+
71
+ <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
72
+ <!--:defaultfield="$parent.$parent.defaultfield" print-name="月报（缴费类型）"></print-data>-->
73
+ <month-by-charge-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></month-by-charge-print>
74
+
75
+ </div>
76
+ </div>
77
+ </div>
78
+ </criteria>
79
+ <data-grid :model="model" :sumsmodel="sumsmodel" partial='list' class="list_area table_sy" @dblclick="$parent.dblclick" v-ref:grid>
80
+ <template partial='head'>
81
+ <tr>
82
+ <th>
83
+ <nobr>购买日期</nobr>
84
+ </th>
85
+ <th>
86
+ <nobr>开户人次</nobr>
87
+ </th>
88
+ <th>
89
+ <nobr>开户气量</nobr>
90
+ </th>
91
+ <th>
92
+ <nobr>开户金额</nobr>
93
+ </th>
94
+ <th>
95
+ <nobr>再购人次</nobr>
96
+ </th>
97
+ <th>
98
+ <nobr>再购气量</nobr>
99
+ </th>
100
+ <th>
101
+ <nobr>再购金额</nobr>
102
+ </th>
103
+ <th>
104
+ <nobr>补卡人次</nobr>
105
+ </th>
106
+ <th>
107
+ <nobr>补卡金额</nobr>
108
+ </th>
109
+ <th>
110
+ <nobr>补气人次</nobr>
111
+ </th>
112
+ <th>
113
+ <nobr>补气气量</nobr>
114
+ </th>
115
+ <th>
116
+ <nobr>补气金额</nobr>
117
+ </th>
118
+ <th>
119
+ <nobr>换表人次</nobr>
120
+ </th>
121
+ <th>
122
+ <nobr>柜台微信</nobr>
123
+ </th>
124
+ <th>
125
+ <nobr>财务收款</nobr>
126
+ </th>
127
+ <th>
128
+ <nobr>现金缴费</nobr>
129
+ </th>
130
+ <th>
131
+ <nobr>柜台支付宝</nobr>
132
+ </th>
133
+ <th>
134
+ <nobr>P&nbsp;O&nbsp;S</nobr>
135
+ </th>
136
+ <th>
137
+ <nobr>换表金额</nobr>
138
+ </th>
139
+ <th>
140
+ <nobr>合计人次</nobr>
141
+ </th>
142
+ <th>
143
+ <nobr>合计气量</nobr>
144
+ </th>
145
+ <th>
146
+ <nobr>合计金额</nobr>
147
+ </th>
148
+ </tr>
149
+ </template>
150
+ <template partial='body'>
151
+ <td style="text-align: center;">
152
+ <nobr>{{row.f_operate_date}}</nobr>
153
+ </td>
154
+ <td style="text-align: center;">
155
+ <nobr>{{row.f_count_open}}</nobr>
156
+ </td>
157
+ <td style="text-align: center;">
158
+ <nobr>{{row.f_pregas_open}}</nobr>
159
+ </td>
160
+ <td style="text-align: center;">
161
+ <nobr>{{row.f_collection_open}}</nobr>
162
+ </td>
163
+ <td style="text-align: center;">
164
+ <nobr>{{row.f_count_zg}}</nobr>
165
+ </td>
166
+ <td style="text-align: center;">
167
+ <nobr>{{row.f_pregas_zg}}</nobr>
168
+ </td>
169
+ <td style="text-align: center;">
170
+ <nobr>{{row.f_collection_zg}}</nobr>
171
+ </td>
172
+ <td style="text-align: center;">
173
+ <nobr>{{row.f_count_bk}}</nobr>
174
+ </td>
175
+ <td style="text-align: center;">
176
+ <nobr>{{row.f_collection_bk}}</nobr>
177
+ </td>
178
+ <td style="text-align: center;">
179
+ <nobr>{{row.f_count_bq}}</nobr>
180
+ </td>
181
+ <td style="text-align: center;">
182
+ <nobr>{{row.f_pregas_bq}}</nobr>
183
+ </td>
184
+ <td style="text-align: center;">
185
+ <nobr>{{row.f_collection_bq}}</nobr>
186
+ </td>
187
+ <td style="text-align: center;">
188
+ <nobr>{{row.f_count_hb}}</nobr>
189
+ </td>
190
+ <td style="text-align: center;">
191
+ <nobr>{{row.f_payment =='柜台微信'? row.f_collection:0}}</nobr>
192
+ </td>
193
+ <td style="text-align: center;">
194
+ <nobr>{{row.f_payment =='财务收款'? row.f_collection:0}}</nobr>
195
+ </td>
196
+ <td style="text-align: center;">
197
+ <nobr>{{row.f_payment =='现金缴费'? row.f_collection:0}}</nobr>
198
+ </td>
199
+ <td style="text-align: center;">
200
+ <nobr>{{row.f_payment =='柜台支付宝'? row.f_collection:0}}</nobr>
201
+ </td>
202
+ <td style="text-align: center;">
203
+ <nobr>{{row.f_payment =='pos'? row.f_collection:0}}</nobr>
204
+ </td>
205
+ <td style="text-align: center;">
206
+ <nobr>{{row.f_collection_hb}}</nobr>
207
+ </td>
208
+ <td style="text-align: center;">
209
+ <nobr>{{row.f_count}}</nobr>
210
+ </td>
211
+ <td style="text-align: center;">
212
+ <nobr>{{row.f_pregas}}</nobr>
213
+ </td>
214
+ <td style="text-align: center;">
215
+ <nobr>{{row.f_collection}}</nobr>
216
+ </td>
217
+ </template>
218
+ <template partial='foot'>
219
+ <td style="text-align: center;background-color: mistyrose">
220
+ <nobr>合计：</nobr>
221
+ </td>
222
+ <td style="text-align: center;background-color: mistyrose">
223
+ <nobr>{{model.sums.f_count_open}}</nobr>
224
+ </td>
225
+ <td style="text-align: center;background-color: mistyrose">
226
+ <nobr>{{model.sums.f_pregas_open}}</nobr>
227
+ </td>
228
+ <td style="text-align: center;background-color: mistyrose">
229
+ <nobr>{{model.sums.f_collection_open}}</nobr>
230
+ </td>
231
+ <td style="text-align: center;background-color: mistyrose">
232
+ <nobr>{{model.sums.f_count_zg}}</nobr>
233
+ </td>
234
+ <td style="text-align: center;background-color: mistyrose">
235
+ <nobr>{{model.sums.f_pregas_zg}}</nobr>
236
+ </td>
237
+ <td style="text-align: center;background-color: mistyrose">
238
+ <nobr>{{model.sums.f_collection_zg}}</nobr>
239
+ </td>
240
+ <td style="text-align: center;background-color: mistyrose">
241
+ <nobr>{{model.sums.f_count_bk}}</nobr>
242
+ </td>
243
+ <td style="text-align: center;background-color: mistyrose">
244
+ <nobr>{{model.sums.f_collection_bk}}</nobr>
245
+ </td>
246
+ <td style="text-align: center;background-color: mistyrose">
247
+ <nobr>{{model.sums.f_count_bq}}</nobr>
248
+ </td>
249
+ <td style="text-align: center;background-color: mistyrose">
250
+ <nobr>{{model.sums.f_pregas_bq}}</nobr>
251
+ </td>
252
+ <td style="text-align: center;background-color: mistyrose">
253
+ <nobr>{{model.sums.f_collection_bq}}</nobr>
254
+ </td>
255
+ <td style="text-align: center;background-color: mistyrose">
256
+ <nobr>{{model.sums.f_count_hb}}</nobr>
257
+ </td>
258
+ <td style="text-align: center;background-color: mistyrose">
259
+ <nobr>{{row.f_payment =='柜台微信'? row.f_collection:0}}</nobr>
260
+ </td>
261
+ <td style="text-align: center;background-color: mistyrose">
262
+ <nobr>{{row.f_payment =='财务收款'? row.f_collection:0}}</nobr>
263
+ </td>
264
+ <td style="text-align: center;background-color: mistyrose">
265
+ <nobr>{{row.f_payment =='现金缴费'? row.f_collection:0}}</nobr>
266
+ </td>
267
+ <td style="text-align: center;background-color: mistyrose">
268
+ <nobr>{{row.f_payment =='柜台支付宝'? row.f_collection:0}}</nobr>
269
+ </td>
270
+ <td style="text-align: center;background-color: mistyrose">
271
+ <nobr>{{row.f_payment =='pos'? row.f_collection:0}}</nobr>
272
+ </td>
273
+ <td style="text-align: center;background-color: mistyrose">
274
+ <nobr>{{model.sums.f_collection_hb}}</nobr>
275
+ </td>
276
+ <td style="text-align: center;background-color: mistyrose">
277
+ <nobr>{{model.sums.f_count}}</nobr>
278
+ </td>
279
+ <td style="text-align: center;background-color: mistyrose">
280
+ <nobr>{{model.sums.f_pregas}}</nobr>
281
+ </td>
282
+ <td style="text-align: center;background-color: mistyrose">
283
+ <nobr>{{model.sums.f_collection}}</nobr>
284
+ </td>
285
+ </template>
286
+ </data-grid>
287
+ </criteria-paged>
288
+ </div>
289
+ </div>
290
+ </template>
291
+
292
+ <script>
293
+ import {PagedList} from 'vue-client'
294
+ // import defaultPrint from '../config/DefaultPrint'
295
+ import exportConfig from '../../config/exportConfig'
296
+
297
+ let readySomething = async function (self) {
298
+ self.$refs.paged.$refs.cri.model.f_operate_date = self.$login.toStandardYearMonth()
299
+ self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
300
+ // await self.$refs.paged.$refs.cri.search()
301
+ // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
302
+ }
303
+
304
+ export default {
305
+ title: '月报（缴费类型）',
306
+ data() {
307
+ return {
308
+ other:[],
309
+ footer:[],
310
+ model: new PagedList('rs/sql/aode_monthByChargeType', 35, {YeanMouthDate: 'this.model.YeanMouthDate',f_begin_operate_date: 'this.model.f_begin_operate_date',f_end_operate_date: 'this.model.f_end_operate_date'}, {
311
+ f_count_open:0,
312
+ f_pregas_open:0,
313
+ f_collection_open:0,
314
+ f_count_zg:0,
315
+ f_pregas_zg:0,
316
+ f_collection_zg:0,
317
+ f_count_bk:0,
318
+ f_collection_bk:0,
319
+ f_count_bq:0,
320
+ f_pregas_bq:0,
321
+ f_collection_bq:0,
322
+ f_count_hb:0,
323
+ f_collection_hb:0,
324
+ f_count: 0,
325
+ f_pregas: 0,
326
+ f_collection: 0
327
+ }),
328
+ initres: {
329
+ org:[this.$login.f.orgid],
330
+ dep:[this.$login.f.depids],
331
+ user:[this.$login.f.id]
332
+ },
333
+ oneShow: true,
334
+ typeInfo: '选择月份',
335
+ DateType:[{label:'选择月份',value:'选择月份'},{label:'选择区间',value:'选择区间'}],
336
+ hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
337
+ criteriaShow: true,
338
+ orgCondtionStr: '',
339
+ sumsmodel: {},
340
+ orgname: '',
341
+ depname: '',
342
+ sumName:[
343
+ 'f_count_open','f_pregas_open','f_collection_open',
344
+ 'f_count_zg', 'f_pregas_zg','f_collection_zg',
345
+ 'f_count_bk', 'f_collection_bk',
346
+ ' f_count_bq', 'f_pregas_bq','f_collection_bq',
347
+ 'f_count_hb', 'f_collection_bk',
348
+ 'f_count','f_pregas','f_collection'
349
+ ],
350
+ selectfields:[]
351
+ }
352
+ },
353
+ ready() {
354
+ readySomething(this).then(() => {
355
+ this.$emit('ready')
356
+ }).catch((error) => {
357
+ this.$emit('error', error)
358
+ })
359
+ for(var item in exportConfig.dataReportConfig){
360
+ this.selectfields.push(item)
361
+ }
362
+ },
363
+ methods: {
364
+ getotherfooter(){
365
+ this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
366
+ this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
367
+ this.other=[];
368
+ this.footer=[];
369
+ let exportdata = this.getCondition;
370
+ let otherInData=[];
371
+
372
+ otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
373
+ otherInData.push(`导出人：${this.$login.f.name}`)
374
+ let footerData=[],exportfield=this.getfield;
375
+ footerData.push("合计");
376
+ let self = this;
377
+ for(var field in self.sumsmodel){
378
+ footerData.push(`${self.sumsmodel[field]}`);
379
+ }
380
+ this.footer.push(footerData);
381
+ this.other.push(otherInData);
382
+ },
383
+ async selfSearch(args) {
384
+ let f_orgstr = this.orgCondtionStr
385
+ if (!this.orgCondtionStr) {
386
+ f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
387
+ }
388
+ args.condition = `${args.condition} ` + f_orgstr
389
+ await this.model.search(args.condition, args.model)
390
+
391
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
392
+ console.log('计算合计。', this.sumsmodel)
393
+ if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
394
+ for (let key in this.sumsmodel) {
395
+ this.sumsmodel[key] = 0
396
+ }
397
+ }
398
+ this.$dispatch('getdata', this.sumsmodel)
399
+ },
400
+ ThePolesReverse(){
401
+ if(this.typeInfo[0] === '选择月份'){
402
+ this.$refs.paged.$refs.cri.model.f_begin_operate_date =''
403
+ this.$refs.paged.$refs.cri.model.f_end_operate_date =''
404
+ this.$refs.paged.$refs.cri.model.YeanMouthDate = this.$login.toStandardYearMonth()
405
+ this.oneShow =true
406
+ }else{
407
+ this.$refs.paged.$refs.cri.model.YeanMouthDate =''
408
+ this.$refs.paged.$refs.cri.model.f_begin_operate_date = this.$login.toStandardDateString()
409
+ this.$refs.paged.$refs.cri.model.f_end_operate_date = this.$login.toStandardDateString()
410
+ this.oneShow =false
411
+ }
412
+ },
413
+ clear() {
414
+ //清空部门和人员
415
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
416
+ //部门和人员变为全选
417
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
418
+ this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
419
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
420
+ this.$refs.paged.$refs.cri.model[key] = ''
421
+ })
422
+ },
423
+ show() {
424
+ this.criteriaShow = true
425
+ },
426
+ hidden() {
427
+ this.criteriaShow = false
428
+ },
429
+ getRes(condition,obj) {
430
+ this.orgCondtionStr = condition
431
+ this.orgname = obj.orgnames[0]
432
+ this.depname = obj.depnames[0]
433
+ },
434
+ stamp() {
435
+ this.all = false
436
+ //默认选择要打印的列
437
+ this.modelval = defaultPrint.config
438
+ this.fields = this.getfield
439
+ console.log('所有打印字段', this.fields)
440
+ this.printshow = true
441
+ this.put()
442
+ },
443
+ put() {
444
+ // 对Modelval进行排序
445
+ console.log("put======================================================================")
446
+ this.sortModelval()
447
+ this.thead = `<tr><th colspan=${this.modelval.length}>客户查询统计报表</th></tr><tr>`
448
+ for (let key of this.modelval) {
449
+ this.thead += '<th>' + this.fields[key] + '</th>'
450
+ }
451
+ this.thead += '</tr>'
452
+ },
453
+ print() {
454
+ this.$refs.print.PrintAsFile()
455
+ this.printshow = false
456
+ },
457
+ close() {
458
+ this.printshow = false
459
+ },
460
+ // 对选择的列进行排序
461
+ sortModelval() {
462
+ let sortModel = []
463
+ Object.keys(this.fields).forEach((key) => {
464
+ if (this.modelval.includes(key)) {
465
+ sortModel.push(key)
466
+ }
467
+ })
468
+ this.modelval = sortModel
469
+ console.log('选择的打印的字段', this.modelval)
470
+ }
471
+ },
472
+ watch: {
473
+ 'all'(val) {
474
+ if (val) {
475
+ this.modelval = this.bodyData
476
+ } else {
477
+ this.modelval = defaultPrint.config
478
+ this.put()
479
+ }
480
+ },
481
+ 'modelval.length'() {
482
+ this.put()
483
+ },
484
+ sumsmodel:{
485
+ handler: function(val) {
486
+ this.getotherfooter();
487
+ },
488
+ deep: true
489
+ }
490
+ },
491
+ computed: {
492
+ getCondition() {
493
+ return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,f_operate_date:`${this.$refs.paged.$refs.cri.model.f_operate_date}`
494
+ ,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` ,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`,
495
+ YeanMouthDate:`${this.$refs.paged.$refs.cri.model.YeanMouthDate}`}
496
+ },
497
+ getfield() {
498
+ return exportConfig.monthByChargeConfig
499
+ },
500
+ userstates() {
501
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
502
+ },
503
+ sliceArea() {
504
+ let rs = new Array()
505
+ for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
506
+ let temp = {
507
+ label: this.$login.f.f_allArea[i].label,
508
+ value: this.$login.f.f_allArea[i].label
509
+ }
510
+ rs.push(temp)
511
+ }
512
+ return [{label: '全部', value: ''}, ...rs]
513
+ }
514
+ }
515
+ }
516
+ </script>
517
+
518
+ <style>
519
+ .datapanel {
520
+ color: #333;
521
+ background-color: white;
522
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
523
+ padding: 10px 10px 5px 10px;
524
+ border-radius: 10px;
525
+ }
526
+ </style>
package/src/components/sale/report/aode/MonthByUserType.vue CHANGED
@@ -29,7 +29,7 @@
29
29
  <label class="font_normal_body">包含APP</label>
30
30
  <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
31
31
  :options='$parent.$parent.hasapps' placeholder='请选择'
32
- condition="f_operator {} "
32
+ condition=" {} "
33
33
  close-on-select></v-select>
34
34
  </div>
35
35
  </div>
@@ -364,7 +364,7 @@
364
364
  let readySomething = async function (self) {
365
365
  //console.log("拿到的默认时间是",self.$login.toStandardYearMonth())
366
366
  self.$refs.paged.$refs.cri.model.YeanMouthDate = self.$login.toStandardYearMonth()
367
- self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
367
+ self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
368
368
  // await self.$refs.paged.$refs.cri.search()
369
369
  }
370
370
 
@@ -407,7 +407,7 @@
407
407
  oneShow: true,
408
408
  typeInfo: '选择月份',
409
409
  DateType:[{label:'选择月份',value:'选择月份'},{label:'选择区间',value:'选择区间'}],
410
- hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
410
+ hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
411
411
  criteriaShow: true,
412
412
  orgCondtionStr: '',
413
413
  initres: {
package/src/components/sale/report/aode/YearByChargeTpye.vue CHANGED
@@ -21,7 +21,7 @@
21
21
  <label class="font_normal_body">包含APP</label>
22
22
  <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
23
23
  :options='$parent.$parent.hasapps' placeholder='请选择'
24
- condition="f_operator {} "
24
+ condition=" {} "
25
25
  close-on-select></v-select>
26
26
  </div>
27
27
  </div>
@@ -100,7 +100,7 @@
100
100
  let readySomething = async function (self) {
101
101
  let year = new Date().getFullYear()
102
102
  self.$refs.paged.$refs.cri.model.YeadDate = year+""
103
- self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
103
+ self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
104
104
  // await self.$refs.paged.$refs.cri.search()
105
105
  // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
106
106
  }
@@ -131,7 +131,7 @@
131
131
  orgname: '',
132
132
  depname: '',
133
133
  criteriaShow: true,
134
- hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
134
+ hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
135
135
  orgCondtionStr:'',
136
136
  defaultfield:["f_operate_date","f_count_open","f_pregas_open","f_collection_open","f_count_zg","f_pregas_zg","f_collection_zg","f_count","f_pregas","f_collection"],
137
137
  sumName:[
package/src/components/sale/report/aode/YearByUserType.vue CHANGED
@@ -56,7 +56,7 @@
56
56
  <label class="font_normal_body">包含APP</label>
57
57
  <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
58
58
  :options='$parent.$parent.hasapps' placeholder='请选择'
59
- condition="f_operator {} "
59
+ condition=" {} "
60
60
  close-on-select></v-select>
61
61
  </div>
62
62
  </div>
@@ -162,7 +162,7 @@
162
162
  import exportConfig from '../../config/exportConfig'
163
163
  let readySomething = async function (self) {
164
164
  let year = new Date().getFullYear()
165
- self.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
165
+ self.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
166
166
  self.$refs.paged.$refs.cri.model.YeadDate = year+""
167
167
  // await self.$refs.paged.$refs.cri.search()
168
168
  // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
@@ -205,7 +205,7 @@
205
205
  sumsmodel: {},
206
206
  orgname: '',
207
207
  depname: '',
208
- hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
208
+ hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
209
209
  defaultfield:[],
210
210
  sumName:['f_open_my','f_count_my','f_pregas_my','f_collection_my',
211
211
  'f_open_sy','f_count_sy','f_pregas_sy',