manage-client 4.0.58 → 4.0.60

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.
@@ -16,12 +16,12 @@ var qtx= 'http://36.103.222.144:6300/'
16
16
  // var bendi = 'http://220.194.141.253:8600/'
17
17
  // var bendi = 'http://203.57.101.233:9001'
18
18
  // var bendi = 'http://172.168.1.11:9001/'
19
- // var bendi = 'http://192.168.50.4:8400/'
19
+ // var bendi = 'http://203.57.101.233:9001/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://192.168.50.4:8400/'
22
+ var bendi = 'http://203.57.101.233:9001/'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://192.168.50.4:8400/'
24
+ var wode = 'http://203.57.101.233:9001/'
25
25
  // 192.168.
26
26
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
27
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -29,8 +29,12 @@ var proxyTable = {
29
29
  '/rs/logic/exportfile': {
30
30
  target: bendi
31
31
  },
32
+ '/dataManage': {
33
+ target: 'http://203.57.101.233:9001/'
34
+
35
+ },
32
36
  '/api': {
33
- target: 'http://192.168.50.4:8400'
37
+ target: 'http://203.57.101.233:9001/'
34
38
 
35
39
  },
36
40
  '/rs/sql/chargeQuery_by_gasproperties': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.58",
3
+ "version": "4.0.60",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -5,7 +5,7 @@
5
5
  <div style="height:88%;margin-bottom: 2%;">
6
6
  <div class="col-sm-9" style="overflow-y: auto;">
7
7
  <div class="row" style="height: 15%;" v-for="(index,item) in netWorkAll">
8
- <div class="col-sm-2 form-group">
8
+ <div class="col-sm-3 form-group">
9
9
  <label class="font_normal_body">类型</label>
10
10
  <v-select :value.sync="item.f_type" v-model="item.f_type"
11
11
  title="参数: 管网类型(大屏信息录入)"
@@ -15,17 +15,17 @@
15
15
  :search="false"
16
16
  close-on-select></v-select>
17
17
  </div>
18
- <div class="col-sm-2 form-group">
18
+ <div class="col-sm-3 form-group">
19
19
  <label class="font_normal_body">已建数</label>
20
20
  <input type="text" style="width:60%" class="input_search" v-model="item.f_yijian"
21
21
  placeholder="已建数">
22
22
  </div>
23
- <div class="col-sm-2 form-group">
23
+ <div class="col-sm-3 form-group">
24
24
  <label class="font_normal_body">在建数</label>
25
25
  <input type="text" style="width:60%" class="input_search" v-model="item.f_zaijian"
26
26
  placeholder="在建数">
27
27
  </div>
28
- <div class="col-sm-2 form-group">
28
+ <div class="col-sm-3 form-group">
29
29
  <label class="font_normal_body">审批数</label>
30
30
  <input type="text" style="width:60%" class="input_search" v-model="item.f_shenpi"
31
31
  placeholder="审批数">
@@ -47,7 +47,7 @@
47
47
  <div style="height:88%;margin-bottom: 2%;">
48
48
  <div class="col-sm-9" style="overflow-y: auto;">
49
49
  <div class="row" style="height: 15%;" v-for="(index,item) in sellingAll">
50
- <div class="col-sm-2 form-group">
50
+ <div class="col-sm-3 form-group">
51
51
  <label class="font_normal_body">营业厅</label>
52
52
  <v-select :value.sync="item.f_depname" v-model="item.f_depname"
53
53
  :search="false"
@@ -58,7 +58,7 @@
58
58
  close-on-select></v-select>
59
59
  </div>
60
60
 
61
- <!-- <div class="col-sm-2 form-group">-->
61
+ <!-- <div class="col-sm-3 form-group">-->
62
62
  <!-- <label class="font_normal_body">用户类型</label>-->
63
63
  <!-- <v-select :value.sync="item.f_user_type" v-model="item.f_user_type"-->
64
64
  <!-- :search="false"-->
@@ -69,7 +69,7 @@
69
69
  <!-- close-on-select></v-select>-->
70
70
 
71
71
  <!-- </div>-->
72
- <div class="col-sm-2 form-group">
72
+ <div class="col-sm-3 form-group">
73
73
  <label class="font_normal_body">归属时间</label>
74
74
  <datepicker placeholder="归属时间"
75
75
  v-model="item.f_date"
@@ -78,7 +78,7 @@
78
78
  :show-reset-button="true">
79
79
  </datepicker>
80
80
  </div>
81
- <div class="col-sm-2 form-group">
81
+ <div class="col-sm-3 form-group">
82
82
  <label class="font_normal_body">地区</label>
83
83
  <v-select :value.sync="item.f_area" v-model="item.f_area"
84
84
  :search="false"
@@ -89,17 +89,17 @@
89
89
  close-on-select></v-select>
90
90
 
91
91
  </div>
92
- <div class="col-sm-2 form-group">
92
+ <div class="col-sm-3 form-group">
93
93
  <label class="font_normal_body">售气笔数</label>
94
94
  <input type="text" style="width:60%" class="input_search" v-model="item.f_count"
95
95
  placeholder="售气笔数">
96
96
  </div>
97
- <div class="col-sm-2 form-group">
97
+ <div class="col-sm-3 form-group">
98
98
  <label class="font_normal_body">售气量</label>
99
99
  <input type="text" style="width:60%" class="input_search" v-model="item.f_gas"
100
100
  placeholder="售气量">
101
101
  </div>
102
- <div class="col-sm-2 form-group">
102
+ <div class="col-sm-3 form-group">
103
103
  <label class="font_normal_body">售气金额</label>
104
104
  <input type="text" style="width:60%" class="input_search" v-model="item.f_money"
105
105
  placeholder="售气金额">
@@ -359,7 +359,10 @@
359
359
  props: ['data'],
360
360
  data() {
361
361
  return {
362
- model: new PagedList('api/af-revenue/sql/DrillErrorByUserinfo', 20),
362
+ model: new PagedList('api/af-revenue/sql/DrillErrorByUserinfo', 20, {
363
+ startDate: 'this.model.startDate',
364
+ endDate: 'this.model.endDate'
365
+ }),
363
366
  reportStr: null,
364
367
  show: false,
365
368
  startDate: '',
@@ -409,15 +412,10 @@
409
412
  }
410
413
  },
411
414
  ready() {
412
- readySomething(this)
413
415
  this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-2).substring(0,10) + ' 00:00:00'
414
- // this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
415
416
  this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
416
- // console.log("type:"+this.$refs.paged.$refs.cri.model.f_error_type)
417
+ readySomething(this)
417
418
  this.getErrorInfo('f_error_level')
418
- // console.log("type:"+this.$refs.paged.$refs.cri.model.f_error_type)
419
- this.$refs.paged.$refs.cri.search()
420
-
421
419
  },
422
420
  methods: {
423
421
  userUseInstitutionChange () {
@@ -287,6 +287,13 @@
287
287
  :options='$parent.$parent.safe' placeholder='请选择'
288
288
  close-on-select></v-select>
289
289
  </div>
290
+ <div class="col-sm-2 form-group">
291
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;壁挂炉</label>
292
+ <v-select :value.sync="model.isbgl" v-model="model.isbgl"
293
+ :options='$parent.$parent.bgl' placeholder='请选择'
294
+ condition="isbgl = '{}'"
295
+ close-on-select></v-select>
296
+ </div>
290
297
  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
291
298
  </div>
292
299
  </div>
@@ -348,6 +355,9 @@
348
355
  <th>
349
356
  <nobr>缴费类型</nobr>
350
357
  </th>
358
+ <th>
359
+ <nobr>是否壁挂炉</nobr>
360
+ </th>
351
361
  <th>
352
362
  <nobr>银行户名</nobr>
353
363
  </th>
@@ -426,6 +436,9 @@
426
436
  <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
427
437
  <nobr>{{row.f_cost_type}}</nobr>
428
438
  </td>
439
+ <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
440
+ <nobr>{{row.isbgl}}</nobr>
441
+ </td>
429
442
  <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
430
443
  <nobr><span v-if="row.f_cost_type =='银行代扣'">{{row.f_bank_accopen}}</span></nobr>
431
444
  </td>
@@ -919,6 +932,9 @@
919
932
 
920
933
  return [{label: '全部', value: ''}, ...rs]
921
934
  },
935
+ bgl(){
936
+ return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
937
+ },
922
938
  userstates() {
923
939
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
924
940
  },