manage-client 3.2.131 → 3.2.132

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 (17) hide show
  1. package/package.json +1 -1
  2. package/src/components/SellReport/ManageMonthGas.vue +1 -1
  3. package/src/components/SellReport/ManageSellType.vue +1 -1
  4. package/src/components/sale/businessquery/ChangeMeterQuery.vue +2 -1
  5. package/src/components/sale/businessquery/ChargeQuery.vue +1 -1
  6. package/src/components/sale/businessquery/DisableQuery.vue +2 -1
  7. package/src/components/sale/businessquery/EnableQuery.vue +2 -1
  8. package/src/components/sale/businessquery/FillCardQuery.vue +1 -0
  9. package/src/components/sale/businessquery/FillGasQuery.vue +2 -1
  10. package/src/components/sale/businessquery/OtherChargeQuery.vue +1 -1
  11. package/src/components/sale/businessquery/ReverseQuery.vue +1 -1
  12. package/src/components/sale/businessquery/TransferQuery.vue +1 -1
  13. package/src/components/sale/report/aode/MonthByChargeType.vue +2 -1
  14. package/src/components/sale/report/aode/MonthByUserType.vue +2 -1
  15. package/src/components/sale/report/aode/YearByChargeTpye.vue +2 -1
  16. package/src/components/sale/report/aode/YearByUserType.vue +2 -1
  17. package/src/filiale/macheng/config/exportConfig.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.131",
3
+ "version": "3.2.132",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/ManageMonthGas.vue CHANGED
@@ -26,7 +26,7 @@
26
26
  :show-reset-button="reset">
27
27
  </datepicker>
28
28
  </div>
29
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
29
+ <res-select-group :initres="$parent.$parent.initres" :show-component=['company','department','operator'] :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
30
30
  <div class="col-sm-2 form-group">
31
31
  <label class="font_normal_body">收费状态</label>
32
32
  <v-select :value.sync="$parent.$parent.f_state"
package/src/components/SellReport/ManageSellType.vue CHANGED
@@ -220,7 +220,7 @@
220
220
  },
221
221
  getdep (obj, val) {
222
222
  this.depname = val[0]
223
- // this.userresid = obj
223
+ this.userresid = obj
224
224
  this.f_depid = obj
225
225
  },
226
226
  getuser ( obj, val) {
package/src/components/sale/businessquery/ChangeMeterQuery.vue CHANGED
@@ -60,7 +60,7 @@
60
60
  </div>
61
61
  </div>
62
62
  <div class="row" v-show="$parent.$parent.criteriaShow">
63
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
63
+ <res-select-group :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
64
64
  <div class="col-sm-2 form-group">
65
65
  <label class="font_normal_body">客户名称</label>
66
66
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -530,6 +530,7 @@
530
530
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
531
531
  }
532
532
  args.condition = `${args.condition}` + this.orgCondtionStr
533
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
533
534
  await this.model.search(args.condition, args.model)
534
535
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
535
536
 
package/src/components/sale/businessquery/ChargeQuery.vue CHANGED
@@ -59,7 +59,7 @@
59
59
  </div>
60
60
  </div>
61
61
  <div class="row" v-show="$parent.$parent.criteriaShow">
62
- <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
62
+ <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
63
63
  <div class="col-sm-2 form-group">
64
64
  <label class="font_normal_body">客户名称</label>
65
65
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
package/src/components/sale/businessquery/DisableQuery.vue CHANGED
@@ -132,7 +132,7 @@
132
132
  condition="f_meter_brand = '{}'"
133
133
  close-on-select></v-select>
134
134
  </div>
135
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
135
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
136
136
  </div>
137
137
  </div>
138
138
  </criteria>
@@ -388,6 +388,7 @@
388
388
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
389
389
  }
390
390
  args.condition = `${args.condition}` + this.orgCondtionStr
391
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
391
392
  this.model.search(args.condition, args.model)
392
393
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
393
394
  },
package/src/components/sale/businessquery/EnableQuery.vue CHANGED
@@ -106,7 +106,7 @@
106
106
  condition="f_operat_type = '{}'"
107
107
  close-on-select></v-select>
108
108
  </div>
109
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
109
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
110
110
  </div>
111
111
  </div>
112
112
  </criteria>
@@ -339,6 +339,7 @@
339
339
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
340
340
  }
341
341
  args.condition = `${args.condition} ` + this.orgCondtionStr
342
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
342
343
  this.model.search(args.condition, args.model)
343
344
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
344
345
  },
package/src/components/sale/businessquery/FillCardQuery.vue CHANGED
@@ -397,6 +397,7 @@
397
397
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
398
398
  }
399
399
  args.condition = `${args.condition}` + this.orgCondtionStr
400
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
400
401
  await this.model.search(args.condition, args.model)
401
402
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
402
403
  },
package/src/components/sale/businessquery/FillGasQuery.vue CHANGED
@@ -58,7 +58,7 @@
58
58
  </div>
59
59
 
60
60
  <div class="row" v-show="$parent.$parent.criteriaShow">
61
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
61
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
62
62
  <div class="col-sm-2 form-group">
63
63
  <label class="font_normal_body">客户名称</label>
64
64
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -451,6 +451,7 @@
451
451
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
452
452
  }
453
453
  args.condition = `${args.condition}` + this.orgCondtionStr
454
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
454
455
  this.model.search(args.condition, args.model)
455
456
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
456
457
  this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
package/src/components/sale/businessquery/OtherChargeQuery.vue CHANGED
@@ -56,7 +56,7 @@
56
56
  </div>
57
57
 
58
58
  <div class="row" v-show="$parent.$parent.criteriaShow">
59
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
59
+ <res-select-group :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
60
60
  <div class="col-sm-2 form-group">
61
61
  <label class="font_normal_body">客户名称</label>
62
62
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
package/src/components/sale/businessquery/ReverseQuery.vue CHANGED
@@ -55,7 +55,7 @@
55
55
  </div>
56
56
 
57
57
  <div class="row" v-show="$parent.$parent.criteriaShow">
58
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
58
+ <res-select-group :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
59
59
  <div class="col-sm-2 form-group">
60
60
  <label class="font_normal_body">客户名称</label>
61
61
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
package/src/components/sale/businessquery/TransferQuery.vue CHANGED
@@ -53,7 +53,7 @@
53
53
  </div>
54
54
  </div>
55
55
  <div class="row" v-show="$parent.$parent.criteriaShow">
56
- <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
56
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
57
57
 
58
58
  <div class="col-sm-2 form-group">
59
59
  <label class="font_normal_body">客户地址</label>
package/src/components/sale/report/aode/MonthByChargeType.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
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>
9
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
10
10
  <div class="col-sm-2 form-group">
11
11
  <label class="font_normal_body">时间类型</label>
12
12
  <v-select
@@ -313,6 +313,7 @@
313
313
  f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
314
314
  }
315
315
  args.condition = `${args.condition} ` + f_orgstr
316
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
316
317
  await this.model.search(args.condition, args.model)
317
318
 
318
319
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
package/src/components/sale/report/aode/MonthByUserType.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
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>
9
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
10
10
 
11
11
  <div class="col-sm-2 form-group">
12
12
  <label class="font_normal_body">时间类型</label>
@@ -323,6 +323,7 @@
323
323
  }
324
324
  //由于此处底层组件默认前面加了个and,所以此处前面硬补位一个1=1 等后面加condition了可以替换
325
325
  this.condition = `${args.condition} ` + f_orgstr
326
+ this.condition = this.condition.replace(/f_zones/, "f_slice_area")
326
327
  await this.model.search(this.condition, args.model)
327
328
 
328
329
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
package/src/components/sale/report/aode/YearByChargeTpye.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
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>
9
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
10
10
  <div class="col-sm-2" >
11
11
  <label for="YeadDate" class="font_normal_body">统计年份</label>
12
12
  <datepicker placeholder="结束日期" style="width:60%"
@@ -144,6 +144,7 @@
144
144
  f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
145
145
  }
146
146
  args.condition = `${args.condition} ` + f_orgstr
147
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
147
148
  await this.model.search(args.condition, args.model)
148
149
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
149
150
  console.log('计算合计。', this.sumsmodel)
package/src/components/sale/report/aode/YearByUserType.vue CHANGED
@@ -6,7 +6,7 @@
6
6
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
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>
9
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :cascade =true :mul="false" v-ref:sel></res-select-group>
10
10
  <div class="col-sm-2" >
11
11
  <label for="YeadDate" class="font_normal_body">统计年份</label>
12
12
  <datepicker placeholder="结束日期" style="width:60%"
@@ -200,6 +200,7 @@
200
200
  f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
201
201
  }
202
202
  args.condition = `${args.condition} ` + f_orgstr
203
+ args.condition = args.condition.replace(/f_zones/, "f_slice_area")
203
204
  await this.model.search(args.condition, args.model)
204
205
 
205
206
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
package/src/filiale/macheng/config/exportConfig.js CHANGED
@@ -16,7 +16,7 @@ export default{
16
16
  'f_initial_base': '初始气表底数','f_meter_base': '气表底数','f_hand_date': '最后抄表日期','f_total_usegas_amount': '累计用气金额',
17
17
  'f_total_gas': '表累购气量','f_total_fee': '表累购金额','f_contract_id':'发票编码','f_bz_type':'报装类型',
18
18
  'f_createfile_date': '建档日期', 'f_createfile_person': '建档人','f_depname': '所属营业厅','f_alarm_code': '报警器编号',
19
- 'f_card_id': '卡号', 'f_whether_hairpin': '是否发卡','f_open_date': '开户时间','f_gas_date': '通气日期',
19
+ 'f_card_id': '卡号', 'f_whether_hairpin': '是否发卡','f_open_date': '开户时间','f_zones': '片区',
20
20
  'f_credentials': '证件类型','f_idnumber': '证件号码','f_people_num': '人口数','f_ins_stop_date': '保险结束日期',
21
21
  'f_comments': '备注信息', 'f_used_name': '曾用名','f_rent_phone': '备用电话','f_rent_name': '租户姓名',
22
22
  'f_zuhu_phone': '租户电话','f_is_mgq': '是否煤改气','f_send_usegas_card': '是否发放天然气使用证','f_usetype':'使用类型',