manage-client 3.3.108 → 3.3.110

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.
@@ -19,82 +19,91 @@ var qtx= 'http://36.103.222.144:6300/'
19
19
  // var bendi = 'http://203.57.101.233:8400/'
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.67:31785'
22
+ var server = 'http://192.168.50.4:8400'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://192.168.50.67:31785'
24
+ var local = 'http://127.0.0.1:8084'
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'
28
28
  var proxyTable = {
29
29
  '/rs/logic/exportfile': {
30
- target: bendi
30
+ target: server
31
31
  },
32
32
  '/rs/sql/chargeQuery_by_gasproperties': {
33
- target: 'http://localhost:8084/'
33
+ target: local
34
34
  },
35
35
  '/rs/logic/chargeQuery_by_gasproperties_line': {
36
- target: 'http://localhost:8084/'
36
+ target: local
37
37
  },
38
38
  '/files': {
39
- target: bendi
39
+ target: server
40
40
  },
41
41
  // 查找资源服务数据
42
42
  '/rs/search': {
43
- target: bendi
43
+ target: server
44
44
  },
45
45
  // 查找资源服务数据
46
46
  '/rs/logic/getLogin': {
47
- target: bendi
47
+ target: server
48
48
  },
49
49
  // 查找资源服务数据
50
50
  '/rs/logic/getInitData': {
51
- target: bendi
51
+ target: server
52
52
  },
53
53
  '/rs/logic/getSaleInitData': {
54
- target: bendi
54
+ target: server
55
55
  },
56
56
  // 用户登录服务地址
57
57
  '/rs/user': {
58
- target: bendi
58
+ target: server
59
59
  },
60
60
  '/rs/path/getParams': {
61
- target: bendi
61
+ target: server
62
62
  },
63
63
  '/rs/data': {
64
- target: bendi
64
+ target: server
65
65
  },
66
66
  '/rs/license': {
67
- target: bendi
67
+ target: server
68
68
  },
69
69
  '/rs/db': {
70
- target: bendi
70
+ target: server
71
71
  },
72
72
  '/excel': {
73
- target: bendi
73
+ target: server
74
74
  },
75
75
  '/rs/config': {
76
- target: bendi
76
+ target: server
77
77
  },
78
78
  '/rs/sql/getLicenseById': {
79
- target: bendi
79
+ target: server
80
80
  },
81
81
  '/rs/report': {
82
- target: bendi
82
+ target: server
83
83
  },
84
84
  '/rs/vue': {
85
- target: bendi
85
+ target: server
86
86
  },
87
87
  '/rs/file': {
88
- target: bendi
88
+ target: local
89
89
  },
90
90
  '/rs/sql/singleTable': {
91
- target: bendi
91
+ target: server
92
+ },
93
+ '/rs/sql/address': {
94
+ target: server
95
+ },
96
+ '/rs/sql/getFiles': {
97
+ target: server
92
98
  },
93
99
  '/rs/sql': {
94
- target: 'http://localhost:8084/'
100
+ target: local
101
+ },
102
+ '/rs/logic': {
103
+ target: local
95
104
  },
96
105
  '/rs': {
97
- target: wode
106
+ target: server
98
107
  }
99
108
  }
100
109
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.108",
3
+ "version": "3.3.110",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -19,7 +19,7 @@
19
19
  style="width:60%"
20
20
  :value.sync="model.startDate"
21
21
  :disabled-days-of-Week="[]"
22
- :format="'yyyy-MM-dd'"
22
+ :format="'yyyy-MM-dd HH:mm:ss'"
23
23
  :show-reset-button="reset">
24
24
  </datepicker>
25
25
  </div>
@@ -30,7 +30,7 @@
30
30
  style="width:60%"
31
31
  :value.sync="model.endDate"
32
32
  :disabled-days-of-Week="[]"
33
- :format="'yyyy-MM-dd'"
33
+ :format="'yyyy-MM-dd HH:mm:ss'"
34
34
  :show-reset-button="reset">
35
35
  </datepicker>
36
36
  </div>
@@ -64,6 +64,22 @@
64
64
  </div>
65
65
  </div>
66
66
  <div class="row" v-show="$parent.$parent.criteriaShow">
67
+ <div class="col-sm-2 form-group">
68
+ <label class="font_normal_body">客户状态&emsp; </label>
69
+ <v-select :value.sync="model.f_user_state"
70
+ v-model="model.f_user_state"
71
+ :options='$parent.$parent.userstates' placeholder='请选择'
72
+ condition="f_user_state = '{}'"
73
+ close-on-select></v-select>
74
+ </div>
75
+ <div class="col-sm-2 form-group">
76
+ <label class="font_normal_body">气表状态&emsp;</label>
77
+ <v-select :value.sync="model.f_table_state"
78
+ v-model="model.f_table_state"
79
+ :options='$parent.$parent.tablestate' placeholder='请选择'
80
+ condition="f_table_state = '{}'"
81
+ close-on-select></v-select>
82
+ </div>
67
83
  <div class="col-sm-2 form-group">
68
84
  <label class="font_normal_body">表&emsp;&emsp;号&emsp;</label>
69
85
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -125,7 +141,7 @@
125
141
  condition="f_book_slice_area = '{}'"></v-select>
126
142
  </div>
127
143
  <div class="col-sm-2 ">
128
- <label for="f_meter_classify"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表类型</label>
144
+ <label for="f_meter_classify"class="font_normal_body">表类型&emsp;&emsp;</label>
129
145
  <v-select id="f_meter_classify"
130
146
  v-model="model.meter_classify"
131
147
  placeholder='表类型'
@@ -287,8 +303,8 @@
287
303
  self.initParams()
288
304
  self.initSlice(self.$login.f.orgid)
289
305
  let year = new Date().getFullYear()
290
- self.$refs.paged.$refs.cri.model.startDate = year+'-01-01'
291
- self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
306
+ self.$refs.paged.$refs.cri.model.startDate = year+'-01-01 00:00:00'
307
+ self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
292
308
  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
293
309
  }
294
310
  export default {
@@ -479,15 +495,15 @@
479
495
  a += ` and f_book_slice_area = '${this.$refs.paged.$refs.cri.model.model.f_book_slice_area}'`
480
496
  }
481
497
  if(this.$refs.paged.$refs.cri.model.startDate){
482
- this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `
498
+ this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}' `
483
499
  }else{
484
- this.model.params.startDate ='DATEADD(yy,DATEDIFF(yy,0,getdate()),0)'
500
+ this.model.params.startDate = this.$login.toStandardDateString() + ' 00:00:00'
485
501
  }
486
502
 
487
503
  if(this.$refs.paged.$refs.cri.model.endDate){
488
- this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate} 23:59:59' `
504
+ this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}' `
489
505
  }else{
490
- this.model.params.endDate ='DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
506
+ this.model.params.endDate = this.$login.toStandardDateString() + ' 23:59:59'
491
507
  }
492
508
  this.mycondition = a
493
509
  args.condition = args.condition+ ` ${this.filialeCodeStr}`
@@ -514,6 +530,12 @@
514
530
 
515
531
  },
516
532
  computed: {
533
+ userstates (){
534
+ return this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
535
+ },
536
+ tablestate() {
537
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
538
+ },
517
539
  getfield() {
518
540
  return exportConfig.gasInspectionConfig
519
541
  },
@@ -538,18 +560,18 @@
538
560
  result.condition = result.condition + this.mycondition
539
561
  let temp2 = this.$refs.paged.$refs.cri
540
562
  if (temp2.model.startDate && temp2.model.endDate) {
541
- result.startDate = ` '${temp2.model.startDate} 00:00:00'`
542
- result.endDate = ` '${temp2.model.endDate} 23:59:59'`
563
+ result.startDate = ` '${temp2.model.startDate}'`
564
+ result.endDate = ` '${temp2.model.endDate}'`
543
565
  } if (!temp2.model.startDate && !temp2.model.endDate) {
544
- result.startDate = 'new Date().getFullYear()'
545
- result.endDate = 'DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
566
+ result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
567
+ result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
546
568
  }
547
569
  if (temp2.model.startDate&&!temp2.model.endDate) {
548
- result.startDate = ` '${temp2.model.startDate} 00:00:00'`
549
- result.endDate = 'DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
570
+ result.startDate = ` '${temp2.model.startDate}'`
571
+ result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
550
572
  } if (temp2.model.endDate&&!temp2.model.startDate) {
551
- result.startDate = 'new Date().getFullYear()'
552
- result.endDate = ` '${temp2.model.endDate} 23:59:59'`
573
+ result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
574
+ result.endDate = ` '${temp2.model.endDate}'`
553
575
  }
554
576
  if (temp2.model.contain_newfile==='否'){
555
577
  result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate
@@ -42,6 +42,7 @@
42
42
  <read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn" v-ref:readcard></read-card>
43
43
  <button class="button_search button_spacing" @click="search()">查询</button>
44
44
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
45
+ <button class="button_clear button_spacing" @click="$parent.$parent.serialNumber">流水号补录</button>
45
46
 
46
47
  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
47
48
  :field="$parent.$parent.getfield" :header="$parent.$parent.other"
@@ -81,7 +82,7 @@
81
82
  condition="f_address like '%{}%'" placeholder='客户地址'>
82
83
  </div>
83
84
  <div class="col-sm-2 form-group">
84
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
85
+ <label class="font_normal_body" style="letter-spacing: 2em;margin-right: -2em">小区</label>
85
86
  <v-select :value.sync="model.f_residential_area"
86
87
  class="select_list select"
87
88
  v-model="model.f_residential_area"
@@ -94,7 +95,7 @@
94
95
  </div>
95
96
  <div
96
97
  class="col-sm-2 form-group">
97
- <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
98
+ <label class="font_normal_body" style="letter-spacing: 2em;margin-right: -2em" >区域</label>
98
99
  <v-select
99
100
  v-model="model.f_pcd"
100
101
  placeholder='选择区域'
@@ -329,18 +330,26 @@
329
330
  close-on-select></v-select>
330
331
  </div>
331
332
  <div class="col-sm-2 form-group">
332
- <label class="font_normal_body">终端号</label>
333
+ <label class="font_normal_body" style="letter-spacing: 0.5em;margin-right: -0.5em">终端号</label>
333
334
  <input type="text" style="width:60%" class="input_search" v-model="model.f_terminal_num"
334
335
  condition="f_terminal_num like '{}'" placeholder='终端号'>
335
336
  </div>
336
337
  <div class="col-sm-2 form-group">
337
- <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
338
+ <label class="font_normal_body" style="letter-spacing: 0.5em;margin-right: -0.5em">壁挂炉</label>
338
339
  <v-select :value.sync="model.isbgl"
339
340
  v-model="model.isbgl"
340
341
  :options='$parent.$parent.bgl' placeholder='请选择'
341
342
  condition="isbgl = '{}'"
342
343
  close-on-select></v-select>
343
344
  </div>
345
+ <div class="col-sm-2 form-group">
346
+ <label class="font_normal_body" style="text-align: center;letter-spacing: 0.5em;margin-right: -0.5em">是否有<br/>流水号</label>
347
+ <v-select :value.sync="model.ishaisnumber"
348
+ v-model="model.ishaisnumber"
349
+ :options='$parent.$parent.ishaisnumberoption' placeholder='请选择'
350
+ condition="{}"
351
+ close-on-select></v-select>
352
+ </div>
344
353
  </div>
345
354
  </div>
346
355
  </criteria>
@@ -786,6 +795,25 @@
786
795
  <footer slot="modal-footer" class="modal-footer">
787
796
  </footer>
788
797
  </modal>
798
+ <modal :show.sync="serialNumberModelShow" v-if="serialNumberModelShow" style="width:auto;" v-ref:modal middle backdrop="false">
799
+ <article slot="modal-body">
800
+ <div style="text-align: center" class="row">
801
+
802
+ <file-upload style="margin-left:100px;padding-top:20px" class="my-file-uploader" :name="'myFile' + uuid"
803
+ action="rs/file/uploadFile" tagname="文件上传"
804
+ accept=".doc, .docx, .xls, .xlsx, .jpg, .png, .gif, .bmp, .avi, .mp4, .wmv, .rmvb, .mov, .pdf"
805
+ :headers="{'username': this.$login.f.name, 'blodid': uuid,'businessid':uuid, 'fremarks': '','defname':'','fusetype':'收费'}"
806
+ v-ref:file></file-upload>
807
+ <div class="col-sm-8 form-group" style="margin-left:150px;padding-top:10px" :class="[!f_serial_number ? 'has-error' : '']">
808
+ <label class="font_normal_body">银行流水号</label>
809
+ <input type="text" style="width:60%" class="input_search" v-model="f_serial_number" placeholder='银行流水号'>
810
+ </div>
811
+ </div>
812
+ </article>
813
+ <footer slot="modal-footer" class="modal-footer">
814
+ <button type="button" class="btn btn-primary" :disabled="!f_serial_number" @click="serialNumberConfirm">确定</button>
815
+ </footer>
816
+ </modal>
789
817
  </div>
790
818
  <high-meter-idcard :show.sync="false" v-ref:highcard ></high-meter-idcard>
791
819
  </template>
@@ -834,6 +862,11 @@
834
862
  data() {
835
863
  return {
836
864
  IdCardInfo:'',
865
+ serialNumberShow : false,
866
+ serialNumberModelShow : false,
867
+ // 随机数uuid
868
+ uuid: '',
869
+ f_serial_number: '',
837
870
  card:'',
838
871
  isSingleUser: null,
839
872
  startDate1:'',
@@ -871,6 +904,7 @@
871
904
  dep:[],
872
905
  user:[]
873
906
  },
907
+ operatornames: [],
874
908
  model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
875
909
  f_pregas: 0,
876
910
  f_preamount: 0,
@@ -916,6 +950,7 @@
916
950
  writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'},{label: '写卡失败',value: '写卡失败'}],
917
951
  bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
918
952
  allorgid:[],
953
+ ishaisnumberoption:[{label: '全部', value: ''},{label: '是', value: ' f_serial_number is not null '},{label: '否', value: ' f_serial_number is null '}],
919
954
  tempfalg :false,
920
955
  lastorgstr:'',
921
956
  // pos设备列表
@@ -939,7 +974,44 @@
939
974
  })
940
975
  },
941
976
  methods: {
942
- // 获取设备下拉选
977
+ async serialNumber (){
978
+ if (!this.serialNumberShow){
979
+ this.$showAlert('仅当查询自己的现金缴费操作时才可以进行流水号补录', 'warning', 3000)
980
+ return
981
+ }
982
+ this.serialNumberModelShow = true
983
+ this.f_serial_number = ''
984
+ this.uuid = this.guid()
985
+ },
986
+ serialNumberConfirm() {
987
+ let param = {
988
+ uuid: this.uuid,
989
+ f_serial_number: this.f_serial_number,
990
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
991
+ endDate: this.$refs.paged.$refs.cri.model.endDate,
992
+ condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
993
+ orderitem: this.orderitem ? `${this.orderitem}` : " f_operate_date desc"
994
+ }
995
+ let http = new HttpResetClass()
996
+ http.load('POST', 'rs/logic/serialNumberUpdate', param,
997
+ {resolveMsg: '操作成功', rejectMsg: null}).then((res) => {
998
+ this.serialNumberModelShow=false;
999
+ this.row = res.data[0]
1000
+ this.search()
1001
+ }).catch((error) => {
1002
+ this.serialNumberModelShow=false
1003
+ this.$showAlert('操作失败', 'error', 3000)
1004
+ this.search()
1005
+ })
1006
+ },
1007
+ guid() {
1008
+ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
1009
+ let r = Math.random() * 16 | 0,
1010
+ v = c == 'x' ? r : (r & 0x3 | 0x8)
1011
+ return v.toString(16)
1012
+ })
1013
+ },
1014
+ // 获取设备下拉选
943
1015
  async getEquipment () {
944
1016
  let HttpReset = new HttpResetClass()
945
1017
  let param = {
@@ -1109,6 +1181,11 @@
1109
1181
  args.condition +=` and f_idnumber='${this.IdCardInfo}'`
1110
1182
  }
1111
1183
  this.model.search(args.condition, args.model)
1184
+ let condition1 = this.operatornames.length && this.operatornames[0] === this.$login.f.id
1185
+ let condition2 = this.$refs.paged.$refs.cri.model.f_payment.length && this.$refs.paged.$refs.cri.model.f_payment[0].indexOf('现金') > -1
1186
+ console.log("========condition1",condition1)
1187
+ console.log("========condition2",condition2)
1188
+ this.serialNumberShow = condition1 && condition2
1112
1189
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
1113
1190
  this.card=''
1114
1191
  this.IdCardInfo=''
@@ -1140,8 +1217,7 @@
1140
1217
  this.orgCondtionStr = condition
1141
1218
  this.orgname = obj.orgnames[0]
1142
1219
  this.depname = obj.depnames[0]
1143
-
1144
-
1220
+ this.operatornames = obj.operatornames
1145
1221
  },
1146
1222
  async updateParams() {
1147
1223
  await this.$MagLoadParams.loadParam(this.f_filialeid)
@@ -1178,6 +1254,17 @@
1178
1254
  'getidcard'(IdCard){
1179
1255
  // console.log(param)
1180
1256
  this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
1257
+ },
1258
+ 'onFileUpload'(files,res){
1259
+ if(res && res.id ){
1260
+ let msg = '上传成功'
1261
+ if(!this.f_serial_number){
1262
+ msg = '上传成功,请填写流水号之后进行确认'
1263
+ }
1264
+ this.$showAlert(msg, 'success', 2000)
1265
+ }else{
1266
+ this.$showAlert('上传失败,请检查文件类型', 'warning', 2000)
1267
+ }
1181
1268
  }
1182
1269
  },
1183
1270
  watch: {
@@ -0,0 +1,682 @@
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main">
4
+ <div class="flex" v-if="!show">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
+ <div class="row">
9
+ <div class="col-sm-2 form-group">
10
+ <label class="font_normal_body">公&emsp;&emsp;司&emsp;</label>
11
+ <right-tree @re-res="$parent.$parent.getorg"
12
+ :initresid='$parent.$parent.org'></right-tree>
13
+ </div>
14
+
15
+ <div class="col-sm-2 form-group ">
16
+ <label for="startDate" class="font_normal_body">抄表开始&emsp;</label>
17
+ <datepicker id="startDate" placeholder="开始日期"
18
+ v-model="model.startDate"
19
+ style="width:60%"
20
+ :value.sync="model.startDate"
21
+ :disabled-days-of-Week="[]"
22
+ :format="'yyyy-MM-dd HH:mm:ss'"
23
+ :show-reset-button="reset">
24
+ </datepicker>
25
+ </div>
26
+ <div class="col-sm-2 form-group ">
27
+ <label for="startDate" class="font_normal_body">抄表结束&emsp;</label>
28
+ <datepicker id="endDate" placeholder="结束日期"
29
+ v-model="model.endDate"
30
+ style="width:60%"
31
+ :value.sync="model.endDate"
32
+ :disabled-days-of-Week="[]"
33
+ :format="'yyyy-MM-dd HH:mm:ss'"
34
+ :show-reset-button="reset">
35
+ </datepicker>
36
+ </div>
37
+
38
+ <div class="col-sm-2 form-group ">
39
+ <label for="f_gasproperties"class="font_normal_body">用气性质&emsp;</label>
40
+ <v-select id="f_gasproperties"
41
+ style="width:60%"
42
+ v-model="model.f_gasproperties"
43
+ placeholder='用气性质'
44
+ :value.sync="model.f_gasproperties"
45
+ :options='$parent.$parent.gasproperties'
46
+ condition="f_gasproperties = '{}'"
47
+ close-on-select >
48
+ </v-select>
49
+ </div>
50
+ <div class="span" style="float:right;">
51
+ <button class="btn button_search" @click="search()">查询</button>
52
+ <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
53
+ <export-excel :data="$parent.$parent.getCondition"
54
+ :field="$parent.$parent.getfield"
55
+ :footer="$parent.$parent.footer"
56
+ :header="$parent.$parent.other"
57
+ sqlurl="rs/logic/exportfile"
58
+ :sql-name="$parent.$parent.sqlName"
59
+ template-name='用气稽查导出' :choose-col="true"></export-excel>
60
+ <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
61
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
62
+
63
+ </div>
64
+ </div>
65
+ <div class="row" v-show="$parent.$parent.criteriaShow">
66
+ <div class="col-sm-2 form-group">
67
+ <label class="font_normal_body" title="二级用气性质">二级性质</label>
68
+ <v-select :value.sync="model.f_gasproperties_second" v-model="model.f_gasproperties_second"
69
+ :options='$parent.$parent.gaspropertiessecond' placeholder='二级用气性质'
70
+ condition="f_gasproperties_second = '{}'"
71
+ close-on-select></v-select>
72
+ </div>
73
+ <div class="col-sm-2 form-group">
74
+ <label class="font_normal_body">客户状态&emsp; </label>
75
+ <v-select :value.sync="model.f_user_state"
76
+ v-model="model.f_user_state"
77
+ :options='$parent.$parent.userstates' placeholder='请选择'
78
+ condition="f_user_state = '{}'"
79
+ close-on-select></v-select>
80
+ </div>
81
+ <div class="col-sm-2 form-group">
82
+ <label class="font_normal_body">气表状态&emsp;</label>
83
+ <v-select :value.sync="model.f_table_state"
84
+ v-model="model.f_table_state"
85
+ :options='$parent.$parent.tablestate' placeholder='请选择'
86
+ condition="f_table_state = '{}'"
87
+ close-on-select></v-select>
88
+ </div>
89
+ <div class="col-sm-2 form-group">
90
+ <label class="font_normal_body">表&emsp;&emsp;号&emsp;</label>
91
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
92
+ condition="f_meternumber = '{}'" placeholder='表号'>
93
+ </div>
94
+ <div class="col-sm-2 form-group ">
95
+ <label class="font_normal_body">用户类型&emsp;</label>
96
+ <v-select :value.sync="model.f_user_type"
97
+ @change="$parent.$parent.userTypeChange()"
98
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
99
+ condition="f_user_type = '{}'"
100
+ close-on-select></v-select>
101
+ </div>
102
+ <div class="col-sm-2 form-group">
103
+ <label class="font_normal_body">气价类型</label>
104
+ <v-select :value.sync="model.pricetype" v-model="model.pricetype"
105
+ placeholder='气价类型' :options="$parent.$parent.pricetypes"
106
+ close-on-select v-ref:type>
107
+ </v-select>
108
+ </div>
109
+ <div class="col-sm-2 form-group">
110
+ <label class="font_normal_body">气价名称</label>
111
+ <v-select :value.sync="model.f_price_name"
112
+ v-model="model.f_price_name"
113
+ :options="$parent.$parent.getPricenames"
114
+ condition="f_price_name = '{}'"
115
+ close-on-select></v-select>
116
+ </div>
117
+ <div class="col-sm-2 form-group">
118
+ <label class="font_normal_body">客户名称&emsp;</label>
119
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
120
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
121
+ </div>
122
+ <div class="col-sm-2 form-group">
123
+ <label class="font_normal_body">客户编号&emsp;</label>
124
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
125
+ condition="f_userinfo_code = '{}' " placeholder="客户编号">
126
+ </div>
127
+ <div class="col-sm-2 form-group">
128
+ <label class="font_normal_body" title="旧客户编号">档案编号&emsp;</label>
129
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
130
+ condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
131
+ </div>
132
+ <div class="col-sm-2 form-group">
133
+ <label class="font_normal_body">表箱号&emsp;&emsp;</label>
134
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
135
+ condition="f_metertitles = '{}'" placeholder="表箱号">
136
+ </div>
137
+ <div class="col-sm-2 form-group">
138
+ <label class="font_normal_body">客户地址&emsp;</label>
139
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
140
+ condition="f_address like '%{}%'" placeholder='客户地址'>
141
+ </div>
142
+ <div class="col-sm-2 form-group">
143
+ <label class="font_normal_body">客户电话&emsp;</label>
144
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
145
+ condition="f_user_phone like '%{}%'" placeholder="客户电话">
146
+ </div>
147
+ <div class="col-sm-2 form-group">
148
+ <label class="font_normal_body">气表品牌&emsp;</label>
149
+ <v-select :value.sync="model.f_meter_brand"
150
+ v-model="model.f_meter_brand"
151
+ :options='$parent.$parent.meterbrands' placeholder='请选择'
152
+ condition="f_meter_brand = '{}'"
153
+ close-on-select></v-select>
154
+ </div>
155
+ <div class="col-sm-2 form-group">
156
+ <label class="font_normal_body">表册片区&emsp;</label>
157
+ <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"
158
+ :options='$parent.$parent.bookSlice' placeholder='片区/表册'
159
+ style="width:60%"
160
+ close-on-select
161
+ condition="f_book_slice_area = '{}'"></v-select>
162
+ </div>
163
+ <div class="col-sm-2 ">
164
+ <label for="f_meter_classify" class="font_normal_body">表类型&emsp;&emsp;</label>
165
+ <v-select id="f_meter_classify"
166
+ v-model="model.meter_classify"
167
+ placeholder='表类型'
168
+ style="width:70%"
169
+ :value.sync="model.meter_classify"
170
+ :options='$parent.$parent.f_meter_classify'
171
+ condition="f_meter_classify like '%{}'"
172
+ :value-single="true"
173
+ close-on-select >
174
+ </v-select>
175
+ </div>
176
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
177
+ <label class="font_normal_body">欠费月数&emsp;</label>
178
+ <div class="row">
179
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummin"
180
+ placeholder="">
181
+ <label class="font_normal_body"> ≤ x ≤ </label>
182
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummax"
183
+ placeholder="">
184
+ </div>
185
+ </div>
186
+
187
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
188
+ <label class="font_normal_body">欠费条数&emsp;</label>
189
+ <div class="row">
190
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummin"
191
+ placeholder="">
192
+ <label class="font_normal_body"> ≤ x ≤ </label>
193
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummax"
194
+ placeholder="">
195
+ </div>
196
+ </div>
197
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
198
+ <label class="font_normal_body">总欠费气量</label>
199
+ <div class="row">
200
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmin"
201
+ placeholder="">
202
+ <label class="font_normal_body"> ≤ x ≤ </label>
203
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmax"
204
+ placeholder="">
205
+ </div>
206
+ </div>
207
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
208
+ <label class="font_normal_body">总欠费金额</label>
209
+ <div class="row">
210
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemin"
211
+ placeholder="">
212
+ <label class="font_normal_body"> ≤ x ≤ </label>
213
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemax"
214
+ placeholder="">
215
+ </div>
216
+ </div>
217
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
218
+ <label class="font_normal_body">欠费月平均气量</label>
219
+ <div class="row">
220
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmin"
221
+ placeholder="">
222
+ <label class="font_normal_body"> ≤ x ≤ </label>
223
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmax"
224
+ placeholder="">
225
+ </div>
226
+ </div>
227
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
228
+ <label class="font_normal_body">用气量&emsp;&emsp;</label>
229
+ <div class="row">
230
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_min"
231
+ placeholder="">
232
+ <label class="font_normal_body"> ≤ x ≤ </label>
233
+ <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_max"
234
+ placeholder="">
235
+ </div>
236
+ </div>
237
+ </div>
238
+
239
+ </div>
240
+ </criteria>
241
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
242
+ <template partial='head'>
243
+ <tr>
244
+ <th><nobr>序号</nobr></th>
245
+ <th><nobr>客户编号</nobr></th>
246
+ <th><nobr>客户电话</nobr></th>
247
+ <th><nobr>档案编号</nobr></th>
248
+ <th><nobr>表号</nobr></th>
249
+ <th><nobr>客户名称</nobr></th>
250
+ <th><nobr>地址</nobr></th>
251
+ <th><nobr>表箱号</nobr></th>
252
+ <th><nobr>用户类型</nobr></th>
253
+ <th><nobr>用气性质</nobr></th>
254
+ <th><nobr>二级用气性质</nobr></th>
255
+ <th><nobr>表具状态</nobr></th>
256
+ <th><nobr>客户状态</nobr></th>
257
+ <th><nobr>气价名称</nobr></th>
258
+ <th><nobr>气表品牌</nobr></th>
259
+ <th><nobr>表册片区</nobr></th>
260
+ <th><nobr>当前表底数</nobr></th>
261
+ <th><nobr>最后抄表日期</nobr></th>
262
+ <th><nobr>用气量</nobr></th>
263
+ <th><nobr>用气金额</nobr></th>
264
+ <th><nobr>欠费月数</nobr></th>
265
+ <th><nobr>欠费条数</nobr></th>
266
+ <th><nobr>欠费月平均气量</nobr></th>
267
+ <th><nobr>欠费气量</nobr></th>
268
+ <th><nobr>欠费金额</nobr></th>
269
+ </tr>
270
+ </template>
271
+ <template partial='body'>
272
+ <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
273
+ <td style="text-align: center;"><nobr>
274
+ <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
275
+ </nobr> </td>
276
+ <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
277
+ <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
278
+ <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
279
+ <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
280
+ <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
281
+ <th style="text-align: center;"><nobr>{{row.f_metertitles}}</nobr></th>
282
+ <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
283
+ <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
284
+ <th style="text-align: center;"><nobr>{{row.f_gasproperties_second}}</nobr></th>
285
+ <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
286
+ <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
287
+ <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
288
+ <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
289
+ <th style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></th>
290
+ <th style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></th>
291
+ <th style="text-align: center;"><nobr>{{row.end_time}}</nobr></th>
292
+ <th style="text-align: center;"><nobr>{{row.f_oughtamount}}</nobr></th>
293
+ <th style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></th>
294
+ <th style="text-align: center;"><nobr>{{row.qianfei_month_num}}</nobr></th>
295
+ <th style="text-align: center;"><nobr>{{row.qianfei_num}}</nobr></th>
296
+ <th style="text-align: center;"><nobr>{{row.qianfei_avg_gas}}</nobr></th>
297
+ <th style="text-align: center;"><nobr>{{row.f_totalowe_gas}}</nobr></th>
298
+ <th style="text-align: center;"><nobr>{{row.f_totalowe_fee}}</nobr></th>
299
+ </template>
300
+ </data-grid>
301
+ </criteria-paged>
302
+ <table class="table-hover">
303
+ <tr style="position: relative" class="table-bordered">
304
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
305
+ <td style="display: inline-block;width: auto;border-right: 1px solid #f2f6fa;padding: 0px 10px 0px 10px;font-weight: bold">总用气量:&emsp;&emsp;{{sumsmodel.f_oughtamount}}</td>
306
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总用气金额:&emsp;&emsp;{{sumsmodel.f_oughtfee}}</td>
307
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费条数:&emsp;&emsp;{{sumsmodel.qianfei_num}}</td>
308
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费气量:&emsp;{{sumsmodel.f_totalowe_gas}}</td>
309
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总欠费金额:&emsp;{{sumsmodel.f_totalowe_fee}}</td>
310
+ </tr>
311
+ </table>
312
+ </div>
313
+ <div class="flex" v-if="show">
314
+ <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
315
+ </div>
316
+ </div></div>
317
+ </template>
318
+ <script>
319
+ /**
320
+ *用户档案查询列表以及添加操作组件
321
+ */
322
+ import { PagedList } from 'vue-client'
323
+ import Vue from 'vue'
324
+ import plugin from 'system-clients/src/plugins/GetLoginInfoService'
325
+
326
+ let readySomething = async function (self) {
327
+ await self.$MagLoadParams.loadParam()
328
+ self.initParams()
329
+ self.initSlice(self.$login.f.orgid)
330
+ let year = new Date().getFullYear()
331
+ self.$refs.paged.$refs.cri.model.startDate = year+'-01-01 00:00:00'
332
+ self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
333
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
334
+ self.prices = self.$MagGetSaleParam.getPrices();
335
+ }
336
+ export default {
337
+ title: '用气稽查',
338
+ data () {
339
+ return {
340
+ other:[],
341
+ footer:[],
342
+ org:[this.$login.f.orgid],
343
+ criteriaShow: false,
344
+ filialeNameStr: null,
345
+ filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
346
+ userid: this.$login.f.id,
347
+ source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
348
+ model: new PagedList('rs/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{
349
+ f_oughtamount:0,
350
+ f_oughtfee:0,
351
+ qianfei_num:0,
352
+ f_totalowe_gas:0,
353
+ f_totalowe_fee:0
354
+ }),
355
+ prices: [],
356
+ rows: null,
357
+ //orgid:'',
358
+ sumsmodel: {},
359
+ sqlName:'getGasInspection',
360
+ gaspropertiessecond: this.$appdata.getParam('二级用气性质') ? [{
361
+ label: '全部',
362
+ value: ''
363
+ }, ...this.$appdata.getParam('二级用气性质')] : [],
364
+ config: {
365
+ defaultPrint: ['f_userinfo_code','f_user_id']
366
+ },
367
+ show:false,
368
+ rowdata:{},
369
+ initres: {
370
+ org:[this.$login.f.orgid],
371
+ dep:[],
372
+ user:[],
373
+ },
374
+ // qianfei_month_nummin:null,
375
+ // qianfei_month_nummax:null,
376
+ // qianfei_nummin:null,
377
+ // qianfei_nummax:null,
378
+ // qianfei_avg_gasmin:null,
379
+ // qianfei_avg_gasmax:null,
380
+ // f_totalowe_feemin:null,
381
+ // f_totalowe_feemax:null,
382
+ // f_totalowe_gasmin:null,
383
+ // f_totalowe_gasmax:null,
384
+ mycondition:null,
385
+ defaultfield: [],
386
+ meterbrands: [],
387
+ // 表册片区
388
+ bookSlice:[],
389
+ f_filialeid: this.$login.f.orgid,
390
+
391
+ }
392
+ },
393
+ watch:{
394
+ sumsmodel:{
395
+ handler: function(val) {
396
+ this.getotherfooter();
397
+ },
398
+ deep: true
399
+ }
400
+ },
401
+ ready () {
402
+ readySomething(this).then(() => {
403
+ this.$emit('ready')
404
+ }).catch((error) => {
405
+ this.$emit('error', error)
406
+ })
407
+ },
408
+ methods: {
409
+ // 初始化抄表册片区
410
+ async initSlice (val) {
411
+ if (val) {
412
+ let getAllArea = await this.$resetpost('/rs/search', {
413
+ source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
414
+ userid: this.$login.f.id
415
+ }, {resolveMsg: null, rejectMsg: '获取片区出错!!!'})
416
+ let arr = getAllArea.data.filter((res) => {
417
+ return res.parentid == val
418
+ })
419
+ this.bookSlice = [{label: '全部',value: ''}]
420
+ arr.forEach((res) => {
421
+ this.bookSlice.push({label: res.name, value: res.name})
422
+ })
423
+ }
424
+ },
425
+ initParams () {
426
+ // 初始化气表品牌
427
+ let brandArr = []
428
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
429
+ let temp = {}
430
+ temp.label = item.label
431
+ temp.value = item.value.f_meter_brand
432
+ brandArr.push(temp)
433
+ })
434
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
435
+ },
436
+ getotherfooter(){
437
+ // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
438
+ // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
439
+ this.other=[];
440
+ this.footer=[];
441
+ // let exportdata = this.$refs.paged.$refs.cri.model.model.mycondition;
442
+ let otherInData=[];
443
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
444
+ let footerData=[],exportfield=this.getfield;
445
+ footerData.push("合计");
446
+ let self = this;
447
+ for(var field in self.sumsmodel){
448
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
449
+ }
450
+ this.footer.push(footerData);
451
+ this.other.push(otherInData);
452
+ },
453
+ cancel() {
454
+ this.show = false
455
+ },
456
+ showmsg(obj){
457
+ this.rowdata=obj
458
+ this.show=true
459
+ },
460
+ async getorg (obj) {
461
+ console.log('组织变化',obj)
462
+ if(obj && obj.resids && obj.resids[0]){
463
+ this.initSlice(obj.resids[0])
464
+ }
465
+
466
+ if(obj.resids.length>0){
467
+ this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
468
+ }
469
+ else{
470
+ this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
471
+ }
472
+ },
473
+ userTypeChange () {
474
+ this.gasproperties=[]
475
+ if(this.$refs.paged.model.model !==null) {
476
+ this.$refs.paged.model.model.f_gasproperties=''
477
+ this.gasproperties = this.$appdata.getParam(this.$refs.paged.model.model.f_user_type[0])
478
+ // this.gasproperties.push({label: '全部', value: ''})
479
+ console.log(this.gasproperties )
480
+ }
481
+ else{
482
+ this.gasproperties =[{label: '全部', value: ''}]
483
+ }
484
+ },
485
+ search () {
486
+ this.$refs.paged.$refs.cri.search()
487
+ },
488
+ selfSearch (args) {
489
+ let a = " and 1=1 "
490
+ let m=this.$refs.paged.$refs.cri.model.model;
491
+ if(m.qianfei_month_nummin!=null && m.qianfei_month_nummin!=''){
492
+ a += " and qianfei_month_num >= "+this.$refs.paged.$refs.cri.model.model.qianfei_month_nummin
493
+ }
494
+ if(m.qianfei_month_nummax!=null&&m.qianfei_month_nummax!=''){
495
+ a+=' and qianfei_month_num <= '+this.$refs.paged.$refs.cri.model.model.qianfei_month_nummax
496
+ }
497
+ if(m.qianfei_nummin!=null&&m.qianfei_nummin!=''){
498
+ a += " and qianfei_num >= "+this.$refs.paged.$refs.cri.model.model.qianfei_nummin
499
+ }
500
+ if(m.qianfei_nummax!=null&&m.qianfei_nummax!=''){
501
+ a +=" and qianfei_num <= "+this.$refs.paged.$refs.cri.model.model.qianfei_nummax
502
+ }
503
+ if(m.qianfei_avg_gasmin!=null&&m.qianfei_avg_gasmin!=''){
504
+ a +=" and qianfei_avg_gas >= "+this.$refs.paged.$refs.cri.model.model.qianfei_avg_gasmin
505
+ }
506
+ if(m.qianfei_avg_gasmax!=null&&m.qianfei_avg_gasmax!=''){
507
+ a += " and qianfei_avg_gas <= "+this.$refs.paged.$refs.cri.model.model.qianfei_avg_gasmax
508
+ }
509
+ if(m.f_totalowe_feemin!=null&&m.f_totalowe_feemin!=''){
510
+ a += " and f_totalowe_fee >= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_feemin
511
+ }
512
+ if(m.f_totalowe_feemax!=null&&m.f_totalowe_feemax!=''){
513
+ a += " and f_totalowe_fee <= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_feemax
514
+ }
515
+ if(m.f_totalowe_gasmin!=null&&m.f_totalowe_gasmin!=''){
516
+ a += " and f_totalowe_gas >= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_gasmin
517
+ }
518
+ if(m.f_totalowe_gasmax!=null&&m.f_totalowe_gasmax!=''){
519
+ a += " and f_totalowe_gas <= "+this.$refs.paged.$refs.cri.model.model.f_totalowe_gasmax
520
+ }
521
+ if (m.f_oughtamount_min) {
522
+ a += " and f_oughtamount >= "+this.$refs.paged.$refs.cri.model.model.f_oughtamount_min
523
+ }
524
+ if (m.f_oughtamount_max) {
525
+ a += " and f_oughtamount <= "+this.$refs.paged.$refs.cri.model.model.f_oughtamount_max
526
+ }
527
+ if (m.f_book_slice_area) {
528
+ a += ` and f_book_slice_area = '${this.$refs.paged.$refs.cri.model.model.f_book_slice_area}'`
529
+ }
530
+ if(this.$refs.paged.$refs.cri.model.startDate){
531
+ this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}' `
532
+ }else{
533
+ this.model.params.startDate = this.$login.toStandardDateString() + ' 00:00:00'
534
+ }
535
+
536
+ if(this.$refs.paged.$refs.cri.model.endDate){
537
+ this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}' `
538
+ }else{
539
+ this.model.params.endDate = this.$login.toStandardDateString() + ' 23:59:59'
540
+ }
541
+ this.mycondition = a
542
+ args.condition = args.condition+ ` ${this.filialeCodeStr}`
543
+ args.condition = args.condition+ ` ${a}`
544
+ console.log("拼接的condition", args.condition, this.model)
545
+ this.model.search(args.condition, args.model)
546
+ },
547
+ hidden(){
548
+ this.criteriaShow = !this.criteriaShow
549
+ },
550
+ clear(){
551
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
552
+ if (key != 'startDate' && key != 'endDate')
553
+ if (key == 'model')
554
+ this.$refs.paged.$refs.cri.model[key] = {}
555
+ else
556
+ this.$refs.paged.$refs.cri.model[key] = []
557
+ })
558
+ this.$refs.paged.$refs.cri.model.contain_newfile='是'
559
+ let year = new Date().getFullYear()
560
+ this.$refs.paged.$refs.cri.model.startDate = year+'-01-01'
561
+ this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
562
+ }
563
+
564
+ },
565
+ computed: {
566
+ getPricenames() {
567
+ let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
568
+ let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
569
+ let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
570
+ console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
571
+ if(this.$refs.paged.$refs.cri.model !==null) {
572
+ let rs = []
573
+ let priceArr = []
574
+ if ( pricetype.length >0) {
575
+ let params = {
576
+ f_price_type: pricetype[0],
577
+ filter: this.f_filialeid,
578
+ prices: this.prices
579
+ }
580
+ this.$MagGetSaleParam.getPrice(params).forEach((item) => {
581
+ let temp = {}
582
+ temp.label = item.label
583
+ temp.value = item.value.f_price_name
584
+ priceArr.push(temp)
585
+ })
586
+ rs = [{label: '全部', value: ''}, ...priceArr]
587
+ }
588
+ if (rs.length === 0) {
589
+ console.log('rs读出来是空')
590
+ this.$refs.paged.$refs.cri.model.f_price_name = ''
591
+ }
592
+ return rs
593
+ }
594
+ },
595
+ userstates (){
596
+ return this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
597
+ },
598
+ tablestate() {
599
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
600
+ },
601
+ pricetypes() {
602
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
603
+ },
604
+ getfield() {
605
+ return {
606
+ 'f_userinfo_code': '客户编号',
607
+ 'f_user_phone': '客户电话',
608
+ 'f_olduserinfo_code': '档案编号',
609
+ 'f_meternumber': '表号',
610
+ 'f_user_name': '客户名称',
611
+ 'f_address': '地址',
612
+ 'f_metertitles': '表箱号',
613
+ 'f_user_type': '用户类型',
614
+ 'f_gasproperties': '用气性质',
615
+ 'f_gasproperties_second': '二级用气性质',
616
+ 'f_price_name': '气价名称',
617
+ 'f_table_state': '表具状态',
618
+ 'f_user_state': '用户状态',
619
+ 'f_meter_brand': '气表品牌',
620
+ 'f_book_slice_area': '表册片区',
621
+ 'end_time': '最后抄表日期',
622
+ 'f_meter_base': '表底数',
623
+ 'f_oughtamount': '用气量',
624
+ 'f_oughtfee': '用气金额',
625
+ 'qianfei_month_num': '欠费月数',
626
+ 'qianfei_num': '欠费条数',
627
+ 'qianfei_avg_gas': '欠费月平均气量',
628
+ 'f_totalowe_gas': '欠费气量',
629
+ 'f_totalowe_fee': '欠费金额'
630
+ }
631
+ },
632
+ usertypes() {
633
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
634
+ },
635
+ gasproperties() {
636
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
637
+ },
638
+ f_meter_classify(){
639
+ return [{label: '全部', value: ''}, {label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
640
+ // return [{label: '卡表', value: '卡表'}]
641
+ },
642
+ getCondition () {
643
+ let result = {
644
+ condition: '',
645
+ startDate: '',
646
+ endDate: '',
647
+ mycondition:''
648
+ }
649
+ result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
650
+ result.condition = result.condition + this.mycondition
651
+ let temp2 = this.$refs.paged.$refs.cri
652
+ if (temp2.model.startDate && temp2.model.endDate) {
653
+ result.startDate = ` '${temp2.model.startDate}'`
654
+ result.endDate = ` '${temp2.model.endDate}'`
655
+ } if (!temp2.model.startDate && !temp2.model.endDate) {
656
+ result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
657
+ result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
658
+ }
659
+ if (temp2.model.startDate&&!temp2.model.endDate) {
660
+ result.startDate = ` '${temp2.model.startDate}'`
661
+ result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
662
+ } if (temp2.model.endDate&&!temp2.model.startDate) {
663
+ result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
664
+ result.endDate = ` '${temp2.model.endDate}'`
665
+ }
666
+ if (temp2.model.contain_newfile==='否'){
667
+ result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate
668
+ }
669
+ return result
670
+ }
671
+ }
672
+ }
673
+ </script>
674
+ <style media="screen">
675
+ .divtext {
676
+ min-width: 50px;
677
+ max-width: 200px;
678
+ border: 1px solid green;
679
+ display: inline-block;
680
+ }
681
+ </style>
682
+
@@ -20,4 +20,8 @@ export default function () {
20
20
  Vue.component('inspect-list-gas', (resolve) => {
21
21
  require(['./InspectListGas'], resolve)
22
22
  })
23
+ // 用气稽查
24
+ Vue.component('gas-inspection', (resolve) => {
25
+ require(['./GasInspection'], resolve)
26
+ })
23
27
  }
package/src/main.js CHANGED
@@ -6,7 +6,7 @@ import { all } from 'vue-client'
6
6
  import { system } from 'system-clients'
7
7
  import { ldap } from 'ldap-clients'
8
8
  import saleManage from './saleManage'
9
- import ShanXianSaleManage from './filiale/shexian/sale'
9
+ import ShanXianSaleManage from './filiale/tongchuan/sale'
10
10
  import webmeterManage from './webmeterManage'
11
11
  import reportManage from './reportManage'
12
12
  import newmanage from './newmanage'
@@ -1,109 +0,0 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.2.174",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "swiper": "^5.4.5"
11
- },
12
- "devDependencies": {
13
- "axios": "0.15.3",
14
- "babel-core": "^6.0.0",
15
- "babel-loader": "^6.0.0",
16
- "babel-plugin-transform-runtime": "^6.0.0",
17
- "babel-preset-es2015": "^6.0.0",
18
- "babel-preset-stage-2": "^6.0.0",
19
- "chai": "^3.5.0",
20
- "co": "^4.6.0",
21
- "connect-history-api-fallback": "^1.1.0",
22
- "cross-env": "^1.0.7",
23
- "cross-spawn": "^2.1.5",
24
- "css-loader": "^0.23.0",
25
- "echarts": "^4.1.0",
26
- "eslint": "^2.0.0",
27
- "eslint-config-standard": "^5.1.0",
28
- "eslint-friendly-formatter": "^1.2.2",
29
- "eslint-loader": "^1.3.0",
30
- "eslint-plugin-html": "^1.3.0",
31
- "eslint-plugin-promise": "^1.0.8",
32
- "eslint-plugin-standard": "^1.3.2",
33
- "eslint-plugin-vue": "^0.1.1",
34
- "eventsource-polyfill": "^0.9.6",
35
- "express": "^4.13.3",
36
- "extract-text-webpack-plugin": "^1.0.1",
37
- "filemanager-webpack-plugin": "^2.0.5",
38
- "file-loader": "^0.8.4",
39
- "function-bind": "^1.0.2",
40
- "html-webpack-plugin": "^2.8.1",
41
- "http-proxy-middleware": "^0.11.0",
42
- "inject-loader": "^2.0.1",
43
- "isparta-loader": "^2.0.0",
44
- "jasmine-core": "^2.4.1",
45
- "jquery": "^3.3.1",
46
- "jsencrypt": "3.0.0-rc.1",
47
- "json-loader": "^0.5.4",
48
- "karma": "^1.4.1",
49
- "karma-chrome-launcher": "^2.2.0",
50
- "karma-coverage": "^1.1.1",
51
- "karma-mocha": "^1.3.0",
52
- "karma-sinon-chai": "^1.3.1",
53
- "karma-sourcemap-loader": "^0.3.7",
54
- "karma-spec-reporter": "0.0.31",
55
- "karma-webpack": "^2.0.2",
56
- "ldap-clients": "3.0.28",
57
- "less": "^2.7.3",
58
- "mkdirp": "^0.5.1",
59
- "mocha": "^3.2.0",
60
- "moment": "2.24.0",
61
- "ncp": "^2.0.0",
62
- "rimraf": "^2.5.0",
63
- "sale-client": "3.4.14",
64
- "selenium-server": "2.52.0",
65
- "sinon": "^2.1.0",
66
- "sinon-chai": "^2.8.0",
67
- "style": "0.0.3",
68
- "style-loader": "^0.20.3",
69
- "swiper": "^5.4.5",
70
- "system-clients": "3.1.89-20",
71
- "url-loader": "^0.5.7",
72
- "vue-amap": "0.5.10",
73
- "vue-client": "1.24.51",
74
- "vue-hot-reload-api": "^1.2.0",
75
- "vue-html-loader": "^1.0.0",
76
- "vue-loader": "8.2.1",
77
- "vue-resource": "^1.5.0",
78
- "vue-router": "^0.7.13",
79
- "vue-strap": "^1.0.9",
80
- "vue-style-loader": "^1.0.0",
81
- "vue-validator": "2.1.7",
82
- "webpack": "1.12.2",
83
- "webpack-dev-middleware": "^1.4.0",
84
- "webpack-hot-middleware": "^2.6.0",
85
- "webpack-merge": "^0.8.3",
86
- "webpack-parallel-uglify-plugin": "^1.0.0"
87
- },
88
- "scripts": {
89
- "unit": "karma start test/unit/karma.conf.js --single-run",
90
- "example": "node build/example-server.js",
91
- "dev": "node build/dev-server.js",
92
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
93
- "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
94
- "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
95
- "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
- "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
- "e2e": "node test/e2e/runner.js",
98
- "release": "bash build/release.sh"
99
- },
100
- "repository": {
101
- "type": "git",
102
- "url": "https://gitee.com/aote/management_modules.git"
103
- },
104
- "keywords": [
105
- "manage"
106
- ],
107
- "author": "liuxudong",
108
- "license": "ISC"
109
- }