manage-client 3.3.50 → 3.3.51

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/SellReport/GasPriceGroup.vue +140 -32
  3. package/src/components/sale/businessquery/TransferQuery.vue +13 -1
  4. package/src/filiale/WEINAN/ManageSummaryReport.vue +13 -1
  5. package/src/filiale/haile/sale/businessquery/ChargeQuery.vue +80 -78
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.50",
3
+ "version": "3.3.51",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/GasPriceGroup.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
8
  <div class="row">
9
- <div class="col-sm-4" >
9
+ <div class="col-sm-2 form-group" >
10
10
  <label class="font_normal_body" for="startDate">开始日期:</label>
11
11
  <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
12
  v-model="model.startDate"
@@ -16,7 +16,7 @@
16
16
  :show-reset-button="reset">
17
17
  </datepicker>
18
18
  </div>
19
- <div class="col-sm-4" >
19
+ <div class="col-sm-2 form-group" >
20
20
  <label class="font_normal_body" for="endDate">结束日期:</label>
21
21
  <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
22
  v-model="model.endDate"
@@ -26,16 +26,63 @@
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
28
  </div>
29
- <div class="col-sm-4">
30
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
31
- <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
- </div>
29
+ <res-select-group
30
+ :show-component="$parent.$parent.resshow"
31
+ :selectin="true" :initres="$parent.$parent.initres"
32
+ :cascade =true @re-res="$parent.$parent.getRes"
33
+ v-ref:sel>
34
+ </res-select-group>
33
35
 
34
36
  </div>
35
37
  <div class="span" style = "float:right;">
36
38
  <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
37
39
  <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
38
40
  <report-excel id='gasprice'></report-excel>
41
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
42
+ 'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
43
+ </div>
44
+ <div class="row" v-show="$parent.$parent.criteriaShow">
45
+ <div class="col-sm-2 form-group">
46
+ <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
47
+ <v-select :value.sync="model.f_payment" multiple
48
+ v-model="model.f_payment"
49
+ :options='$parent.$parent.payment' placeholder='请选择'
50
+ condition="s.f_payment in {}"
51
+ close-on-select></v-select>
52
+ </div>
53
+ <div class="col-sm-2 form-group">
54
+ <label class="font_normal_body">气表类型</label>
55
+ <v-select :value.sync="model.f_meter_type" multiple
56
+ :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
57
+ condition="s.f_meter_type in {}"
58
+ close-on-select></v-select>
59
+ </div>
60
+ <div class="col-sm-2 form-group">
61
+ <label class="font_normal_body">气价类型</label>
62
+ <v-select :value.sync="model.pricetype" v-model="model.pricetype"
63
+ @change="$parent.$parent.pricetypechanged"
64
+ placeholder='气价类型' :options="$parent.$parent.pricetypes"
65
+ condition="sp.f_price_type = '{}'"
66
+ close-on-select v-ref:type>
67
+ </v-select>
68
+ </div>
69
+ <div class="col-sm-2 form-group">
70
+ <label class="font_normal_body">气价名称</label>
71
+ <v-select :value.sync="model.f_price_name"
72
+ v-model="model.f_price_name"
73
+ multiple
74
+ :options="$parent.$parent.getPricenames"
75
+ condition="sp.f_price_name in {}"
76
+ ></v-select>
77
+ </div>
78
+ <!--<div class="col-sm-2 form-group">-->
79
+ <!--<label class="font_normal_body">收费状态</label>-->
80
+ <!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
81
+ <!--v-model="$parent.$parent.f_state"-->
82
+ <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
83
+ <!--condition="f_state in {}"-->
84
+ <!--close-on-select></v-select>-->
85
+ <!--</div>-->
39
86
  </div>
40
87
  </div>
41
88
  </criteria>
@@ -104,6 +151,15 @@
104
151
  <script>
105
152
  import { DataModel } from 'vue-client'
106
153
  import co from 'co'
154
+
155
+ let readySomething = async function (self) {
156
+ self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
157
+ self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
158
+ console.log(self.$login.f)
159
+ await self.$MagLoadParams.loadParam()
160
+ self.initParams()
161
+ self.$refs.paged.$refs.criteria.search()
162
+ }
107
163
  let saveFile = function * (self) {
108
164
  // 线验证文件是否重名
109
165
  let count = yield self.$resetpost('rs/sql/manageSingleTable',
@@ -140,44 +196,60 @@
140
196
  orgname: '',
141
197
  depname: '',
142
198
  operatorname: '',
143
- f_inputtor:[],
144
- f_user_type:'',
199
+ f_inputtor: [],
200
+ f_user_type: '',
201
+ criteriaShow: false,
145
202
  orgCondtionStr: '1=1',
146
203
  model: new DataModel('rs/report/gasPriceGroup', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
147
204
  f_orgid: 'this.model.f_orgid'}),
148
205
  reportStr: null,
149
- show: false
206
+ resshow: ['company', 'department', 'operator'],
207
+ initres: {
208
+ org: [this.$login.f.orgid],
209
+ dep: [],
210
+ user: []
211
+ },
212
+ f_filialeid: this.$login.f.orgid,
213
+ show: false,
150
214
  }
151
215
  },
152
216
  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)
217
+ readySomething(this).then(() => {
218
+ this.$emit('ready')
219
+ }).catch((error) => {
220
+ this.$emit('error', error)
221
+ })
157
222
  },
158
223
  methods: {
224
+ initParams() {
225
+ // 初始化气表品牌
226
+ let brandArr = []
227
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
228
+ let temp = {}
229
+ temp.label = item.label
230
+ temp.value = item.value.f_meter_brand
231
+ brandArr.push(temp)
232
+ })
233
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
234
+ //初始化气表价格
235
+ this.prices = this.$MagGetSaleParam.getPrices()
236
+ },
237
+ hidden () {
238
+ this.criteriaShow = !this.criteriaShow
239
+ },
159
240
  searchData () {
160
241
  this.$refs.paged.$refs.criteria.search()
161
242
  },
162
243
  selfSearch (args) {
163
- let orgcondition = `f_orgid in ('${this.f_orgid}')`
244
+ let orgcondition = args.condition + this.orgCondtionStr
164
245
 
165
246
  this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
166
247
  this.$refs.paged.search(args)
167
248
  },
168
- getRes (obj) {
169
- this.orgname = obj.res[0]
170
- this.depresid = obj.resids
171
- this.f_orgid = obj.resids
172
- },
173
- getdep (obj, val) {
174
- // this.depname = val[0]
175
- this.userresid = obj
176
- this.f_depid = obj
177
- },
178
- getuser ( obj, val) {
179
- this.operatorname = val[0]
180
- this.f_operatorid = obj
249
+ async getRes(condition,obj) {
250
+ this.orgCondtionStr = condition
251
+ this.orgname = obj.orgnames[0]
252
+ this.depname = obj.depnames[0]
181
253
  },
182
254
  // 根据文件路径获取储存的报表内容
183
255
  getFileContent (path) {
@@ -196,11 +268,14 @@
196
268
  close () {
197
269
  this.show = false
198
270
  },
271
+ pricetypechanged () {
272
+ this.$refs.paged.$refs.criteria.model.f_price_name = []
273
+ },
199
274
  // 将报表保存成文件
200
275
  confirmReport () {
201
276
  this.show = true
202
277
  this.filename = this.data.f_report_name + this.$login.toStandardDateString()
203
- },
278
+ }
204
279
  },
205
280
  watch: {
206
281
  'data' (val) {
@@ -212,12 +287,45 @@
212
287
  }
213
288
  },
214
289
  computed: {
215
- usertypes() {
216
- return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
290
+ getPricenames () {
291
+ let pricetype = this.$refs.paged.$refs.criteria.model.pricetype
292
+ if (this.$refs.paged.$refs.criteria.model !== null) {
293
+ let rs = []
294
+ let priceArr = []
295
+ if (pricetype.length > 0) {
296
+ let params = {
297
+ f_price_type: pricetype[0],
298
+ filter: this.f_filialeid,
299
+ prices: this.prices
300
+ }
301
+ this.$MagGetSaleParam.getPrice(params).forEach((item) => {
302
+ let temp = {}
303
+ temp.label = item.label
304
+ temp.value = item.value.f_price_name
305
+ priceArr.push(temp)
306
+ })
307
+ if (priceArr.length == 0) {
308
+ rs = [{label: '全部', value: ''}]
309
+ } else {
310
+ rs = [...priceArr]
311
+ }
312
+ }
313
+ if (rs.length === 0) {
314
+ console.log('rs读出来是空')
315
+ this.$refs.paged.$refs.criteria.model.f_price_name = ''
316
+ }
317
+ return rs
318
+ }
217
319
  },
218
- inputtor() {
219
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
320
+ pricetypes () {
321
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
220
322
  },
323
+ metertypes () {
324
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
325
+ },
326
+ payment () {
327
+ return [...this.$appdata.getParam('付款方式查询')]
328
+ }
221
329
  }
222
330
  }
223
331
  </script>
package/src/components/sale/businessquery/TransferQuery.vue CHANGED
@@ -131,9 +131,15 @@
131
131
  <th>
132
132
  <nobr>新客户电话</nobr>
133
133
  </th>
134
+ <th>
135
+ <nobr>新客户身份证</nobr>
136
+ </th>
134
137
  <th>
135
138
  <nobr>原客户电话</nobr>
136
139
  </th>
140
+ <th>
141
+ <nobr>原客户身份证</nobr>
142
+ </th>
137
143
  <th>
138
144
  <nobr>过户费</nobr>
139
145
  </th>
@@ -180,9 +186,15 @@
180
186
  <td style="text-align: center;">
181
187
  <nobr>{{row.f_newuser_phone}}</nobr>
182
188
  </td>
189
+ <td style="text-align: center;">
190
+ <nobr>{{row.f_newidnumber}}</nobr>
191
+ </td>
183
192
  <td style="text-align: center;">
184
193
  <nobr>{{row.f_user_phone}}</nobr>
185
194
  </td>
195
+ <td style="text-align: center;">
196
+ <nobr>{{row.f_idnumber}}</nobr>
197
+ </td>
186
198
  <td style="text-align: center;">
187
199
  <nobr>{{row.f_transfer_fees}}</nobr>
188
200
  </td>
@@ -230,7 +242,7 @@
230
242
  </div>
231
243
  <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;" v-ref:modal middle backdrop="false">
232
244
  <article slot="modal-body">
233
- <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false" fusetype="过户" :isremark="false" style="width:auto" ></upload>
245
+ <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false" fusetype="过户管理" :isremark="false" style="width:auto" ></upload>
234
246
  </article>
235
247
  <footer slot="modal-footer" class="modal-footer">
236
248
  </footer>
package/src/filiale/WEINAN/ManageSummaryReport.vue CHANGED
@@ -46,7 +46,7 @@
46
46
  </div>
47
47
  <div class="span" style="float:right;">
48
48
  <button class="button_search button_spacing" @click="search()">查询</button>
49
-
49
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
50
50
  <export-excel :data="$parent.$parent.getCondition"
51
51
  :field="$parent.$parent.getfield"
52
52
  :header="$parent.$parent.other"
@@ -383,6 +383,18 @@ export default {
383
383
  this.areaList = [{label: '全部', value: ''}, ...redata]
384
384
  })
385
385
  },
386
+ clear() {
387
+ //清空部门和人员
388
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
389
+ //部门和人员变为全选
390
+ this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
391
+ this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
392
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
393
+ this.$refs.paged.$refs.cri.model[key] = []
394
+ })
395
+ this.f_is_company = '否'
396
+ this.f_is_area = '否'
397
+ },
386
398
  isAreaChange () {
387
399
  if(this.f_is_area){
388
400
  if (this.f_is_area == '是') {
package/src/filiale/haile/sale/businessquery/ChargeQuery.vue CHANGED
@@ -354,50 +354,13 @@
354
354
  <th>
355
355
  <nobr>客户名称</nobr>
356
356
  </th>
357
- <th>
358
- <nobr>片区</nobr>
359
- </th>
360
- <th>
361
- <nobr>小区</nobr>
362
- </th>
357
+
363
358
  <th>
364
359
  <!-- <nobr>客户地址</nobr>-->
365
360
  <data-order field="f_address" name="客户地址"
366
361
  :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
367
362
  </th>
368
- <th>
369
- <nobr>身份证号</nobr>
370
- </th>
371
- <th>
372
- <nobr>客户类型</nobr>
373
- </th>
374
- <th>
375
- <nobr>用气性质</nobr>
376
- </th>
377
- <th>
378
- <nobr>表号</nobr>
379
- </th>
380
- <th>
381
- <nobr>气表品牌</nobr>
382
- </th>
383
- <th>
384
- <nobr>表具状态</nobr>
385
- </th>
386
- <th>
387
- <nobr>卡号</nobr>
388
- </th>
389
- <th>
390
- <nobr>气价名称</nobr>
391
- </th>
392
- <th>
393
- <nobr>购气次数</nobr>
394
- </th>
395
- <th>
396
- <nobr>上期表底数</nobr>
397
- </th>
398
- <th>
399
- <nobr>本期表底数</nobr>
400
- </th>
363
+
401
364
  <th>
402
365
  <nobr>气量</nobr>
403
366
  </th>
@@ -482,6 +445,45 @@
482
445
  <th>
483
446
  <nobr>人员</nobr>
484
447
  </th>
448
+ <th>
449
+ <nobr>片区</nobr>
450
+ </th>
451
+ <th>
452
+ <nobr>小区</nobr>
453
+ </th>
454
+ <th>
455
+ <nobr>身份证号</nobr>
456
+ </th>
457
+ <th>
458
+ <nobr>客户类型</nobr>
459
+ </th>
460
+ <th>
461
+ <nobr>用气性质</nobr>
462
+ </th>
463
+ <th>
464
+ <nobr>表号</nobr>
465
+ </th>
466
+ <th>
467
+ <nobr>气表品牌</nobr>
468
+ </th>
469
+ <th>
470
+ <nobr>表具状态</nobr>
471
+ </th>
472
+ <th>
473
+ <nobr>卡号</nobr>
474
+ </th>
475
+ <th>
476
+ <nobr>气价名称</nobr>
477
+ </th>
478
+ <th>
479
+ <nobr>购气次数</nobr>
480
+ </th>
481
+ <th>
482
+ <nobr>上期表底数</nobr>
483
+ </th>
484
+ <th>
485
+ <nobr>本期表底数</nobr>
486
+ </th>
485
487
  <th>
486
488
  <nobr>部门</nobr>
487
489
  </th>
@@ -568,48 +570,9 @@
568
570
  <td style="text-align: center;">
569
571
  <nobr>{{row.f_user_name}}</nobr>
570
572
  </td>
571
- <td style="text-align: center;">
572
- <nobr>{{row.f_zones}}</nobr>
573
- </td>
574
- <td style="text-align: center;"><nobr>
575
- <nobr>{{row.f_residential_area}}</nobr>
576
- </nobr> </td>
577
573
  <td style="text-align: center;">
578
574
  <nobr>{{row.f_address}}</nobr>
579
575
  </td>
580
- <td style="text-align: center;">
581
- <nobr>{{row.f_idnumber}}</nobr>
582
- </td>
583
- <td style="text-align: center;">
584
- <nobr>{{row.f_user_type}}</nobr>
585
- </td>
586
- <td style="text-align: center;">
587
- <nobr>{{row.f_gasproperties}}</nobr>
588
- </td>
589
- <td style="text-align: center;">
590
- <nobr>{{row.f_meternumber}}</nobr>
591
- </td>
592
- <td style="text-align: center;">
593
- <nobr>{{row.f_meter_brand}}</nobr>
594
- </td>
595
- <td style="text-align: center;">
596
- <nobr>{{row.f_table_state}}</nobr>
597
- </td>
598
- <td style="text-align: center;">
599
- <nobr>{{row.f_card_id}}</nobr>
600
- </td>
601
- <td style="text-align: center;">
602
- <nobr>{{row.f_price_name}}</nobr>
603
- </td>
604
- <td style="text-align: center;">
605
- <nobr>{{row.f_times}}</nobr>
606
- </td>
607
- <td style="text-align: center;">
608
- <nobr>{{row.f_last_tablebase}}</nobr>
609
- </td>
610
- <td style="text-align: center;">
611
- <nobr>{{row.f_tablebase }}</nobr>
612
- </td>
613
576
  <td style="text-align: center;">
614
577
  <nobr>{{row.f_pregas}}</nobr>
615
578
  </td>
@@ -696,6 +659,45 @@
696
659
  <td style="text-align: center;">
697
660
  <nobr>{{row.f_operator}}</nobr>
698
661
  </td>
662
+ <td style="text-align: center;">
663
+ <nobr>{{row.f_zones}}</nobr>
664
+ </td>
665
+ <td style="text-align: center;"><nobr>
666
+ <nobr>{{row.f_residential_area}}</nobr>
667
+ </nobr> </td>
668
+ <td style="text-align: center;">
669
+ <nobr>{{row.f_idnumber}}</nobr>
670
+ </td>
671
+ <td style="text-align: center;">
672
+ <nobr>{{row.f_user_type}}</nobr>
673
+ </td>
674
+ <td style="text-align: center;">
675
+ <nobr>{{row.f_gasproperties}}</nobr>
676
+ </td>
677
+ <td style="text-align: center;">
678
+ <nobr>{{row.f_meternumber}}</nobr>
679
+ </td>
680
+ <td style="text-align: center;">
681
+ <nobr>{{row.f_meter_brand}}</nobr>
682
+ </td>
683
+ <td style="text-align: center;">
684
+ <nobr>{{row.f_table_state}}</nobr>
685
+ </td>
686
+ <td style="text-align: center;">
687
+ <nobr>{{row.f_card_id}}</nobr>
688
+ </td>
689
+ <td style="text-align: center;">
690
+ <nobr>{{row.f_price_name}}</nobr>
691
+ </td>
692
+ <td style="text-align: center;">
693
+ <nobr>{{row.f_times}}</nobr>
694
+ </td>
695
+ <td style="text-align: center;">
696
+ <nobr>{{row.f_last_tablebase}}</nobr>
697
+ </td>
698
+ <td style="text-align: center;">
699
+ <nobr>{{row.f_tablebase }}</nobr>
700
+ </td>
699
701
  <td style="text-align: center;">
700
702
  <nobr>{{row.f_depname}}</nobr>
701
703
  </td>