apply-clients 7.1.36-yuchuan-4 → 7.1.36-yuchuan-5

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 (45) hide show
  1. package/index.html +1 -1
  2. package/package.json +2 -2
  3. package/src/apply.js +9 -3
  4. package/src/applyAndroid.js +9 -0
  5. package/src/assets//345/260/217/345/214/272.png +0 -0
  6. package/src/assets//347/224/250/346/210/267ID.png +0 -0
  7. package/src/assets//347/224/250/346/210/267/345/247/223/345/220/215.png +0 -0
  8. package/src/components/android/AppSign.vue +7 -4
  9. package/src/components/android/AppUpload.vue +1 -1
  10. package/src/components/android/Ignition/VentilationIgnitionHandle.vue +38 -31
  11. package/src/components/android/Process/AppServiceControl.vue +32 -5
  12. package/src/components/android/Process/Processes/AppInstallationDetails.vue +205 -92
  13. package/src/components/android/SealBind.vue +376 -0
  14. package/src/components/android/SealManage.vue +264 -0
  15. package/src/components/android/Supervisory/AppProcessSupervisory.vue +344 -334
  16. package/src/components/android/Task/ShiGongXinXi/AppShowBuildUser.vue +9 -9
  17. package/src/components/android/Task/yiban/AppShowDone.vue +442 -0
  18. package/src/components/android/Task/yiban/ShowDone.vue +95 -0
  19. package/src/components/android/Task/yiban/satisfactionShow.vue +166 -0
  20. package/src/components/product/ApplyCharge/ApplyChargeList.vue +18 -0
  21. package/src/components/product/ApplyGaiXianCharge/ApplyGaiXianViewList.vue +272 -0
  22. package/src/components/product/ApplyGuanXian/GuanXianCaiLiao.vue +1 -1
  23. package/src/components/product/ApplyGuanXian/GuanXianExplorationSelect.vue +31 -31
  24. package/src/components/product/ApplyGuanXian/GuanXianSupervisoryhCart.vue +4 -4
  25. package/src/components/product/ApplyMap/ApplyDragaboutList.vue +2 -2
  26. package/src/components/product/ApplyMap/ApplyMapLocation.vue +22 -10
  27. package/src/components/product/ChongZheng/ApplyChongZhengList.vue +1 -1
  28. package/src/components/product/Function/Service/FunctionServiceControl.vue +125 -14
  29. package/src/components/product/Ignition/IgnitionListManage.vue +1 -1
  30. package/src/components/product/Ignition/IgnitionRecord.vue +22 -0
  31. package/src/components/product/List/OldShowDevices.vue +271 -0
  32. package/src/components/product/List/ShowAllActivity.vue +104 -19
  33. package/src/components/product/List/ShowDevices.vue +1 -1
  34. package/src/components/product/Process/ExplorationSelect.vue +41 -35
  35. package/src/components/product/Process/NewExplorationSelect.vue +31 -31
  36. package/src/components/product/Process/Processes/InstallationDetails.vue +34 -1
  37. package/src/components/product/Process/Processes/Print/printGaiXianCharge.vue +244 -0
  38. package/src/components/product/Process/Processes/devicesManagement.vue +23 -4
  39. package/src/components/product/Process/Processes/newDevicesManagement.vue +10 -1
  40. package/src/components/product/Process/Service/ServiceControl.vue +42 -3
  41. package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue +1 -3
  42. package/src/components/product/Supervisory/SupervisoryControl.vue +2 -0
  43. package/src/components/product/Supervisory/SupervisoryList.vue +17 -0
  44. package/src/components/product/VueUtils/ApplyUpload.vue +3 -2
  45. package/src/components/product/records/AdjustmentRecordList.vue +162 -0
@@ -1,63 +1,88 @@
1
1
  <template>
2
- <div>
3
- <div class="col-xs-12 col-xs-12 form-group app-btn">
4
- <button class="btn btn-info" @click.prevent="openModal()"
5
- :disabled="mark === 1 ||
6
- (model.rows.length >= selectdata.f_install_count && selectdata.defname === '工程施工') ||
7
- (model.rows.length >= selectdata.f_apply_count && (selectdata.defname === '报建受理')) ||
8
- selectdata.defname === '施工通气'"
9
- >添加</button>
10
- </div>
11
-
12
- <div class="col-xs-12 col-xs-12">
13
- <list :model="model" partial='list'>
14
- <div partial class="panel">
15
- <div class="panel-self">
16
- <div class="row">
17
- <p class="col-xs-3 text-left font"><b class="control-label-justify">客户编号</b></p>
18
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_userinfo_id }}</p>
19
- </div>
20
- <div class="row">
21
- <p class="col-xs-3 text-left font"><b class="control-label-justify">客户名称</b></p>
22
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_user_name }}</p>
23
- </div>
24
- <div class="row">
25
- <p class="col-xs-3 text-left font"><b class="control-label-justify">客户电话</b></p>
26
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_user_phone }}</p>
27
- </div>
28
- <div class="row">
29
- <p class="col-xs-3 text-left font"><b class="control-label-justify">地址信息</b></p>
30
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{row.f_address}}{{row.f_address_detail}}</p>
31
- </div>
32
- <div class="row">
33
- <p class="col-xs-3 text-left font"><b class="control-label-justify">表号</b></p>
34
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meternumber }}</p>
2
+ <div class="p-10">
3
+ <criteria-paged :model="model" v-ref:cp>
4
+ <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
5
+ <div partial class="auto">
6
+ <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
7
+ <label class="">楼&emsp;&emsp;号:</label>
8
+ <div class="col-xs-8" >
9
+ <input class="" v-model=model.f_building condition="ui.f_building like '{}%'" />
10
+ </div>
35
11
  </div>
36
- <div class="row">
37
- <p class="col-xs-3 text-left font"><b class="control-label-justify">气表品牌</b></p>
38
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meter_brand }}</p>
12
+ <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
13
+ <label class="">单&emsp;&emsp;元:</label>
14
+ <div class="col-xs-8" >
15
+ <input class="" v-model=model.f_unit condition="ui.f_unit like '{}%'" />
16
+ </div>
39
17
  </div>
40
- <div class="row">
41
- <p class="col-xs-3 text-left font"><b class="control-label-justify">气表型号</b></p>
42
- <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meter_style }}</p>
18
+ <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
19
+ <label class="">门&ensp;牌&ensp;号:</label>
20
+ <div class="col-xs-8" >
21
+ <input class="" v-model=model.f_room condition="ui.f_room like '{}%'" />
22
+ </div>
43
23
  </div>
44
- <div class="row text-right">
45
- <button class="btn btn-info"
46
- @click.prevent="$parent.$parent.openModal(row)">
47
- {{$parent.$parent.mark === 1 ? '查看' : '修正'}}
48
- </button>
49
- <button class="btn btn-danger"
50
- @click="$parent.$parent.deleteUserinfo(row)"
51
- v-if="$parent.$parent.showDeleteUserInfo"
52
- :disabled="$parent.$parent.mark === 1 || row.f_user_state === '正常'">
53
- 销户
54
- </button>
24
+ <div class="row form-group text-right" style="">
25
+ <button class="btn btn-info" @click.prevent="$parent.$parent.openModal()"
26
+ :disabled="mark === 1 ||
27
+ (model.rows.length >= selectdata.f_install_count && selectdata.defname === '工程施工') ||
28
+ (model.rows.length >= selectdata.f_apply_count && (selectdata.defname === '报建受理')) ||
29
+ selectdata.defname === '施工通气'"
30
+ >添加</button>
31
+ <button class="btn btn-primary" @click="search()">查询</button>
32
+ <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
33
+ <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
55
34
  </div>
56
35
  </div>
57
- </div>
58
- </list>
59
- </div>
60
-
36
+ </criteria>
37
+ <list :model="model" partial='list'>
38
+ <div partial class="auto app-text panel">
39
+ <div class="panel-body panel-self">
40
+ <div class="row">
41
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">客户编号</b></p>
42
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_userinfo_id }}</p>
43
+ </div>
44
+ <div class="row">
45
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">客户名称</b></p>
46
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_user_name }}</p>
47
+ </div>
48
+ <div class="row">
49
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">客户电话</b></p>
50
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_user_phone }}</p>
51
+ </div>
52
+ <div class="row">
53
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">地址信息</b></p>
54
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{row.f_address}}{{row.f_address_detail}}</p>
55
+ </div>
56
+ <div class="row">
57
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">表号</b></p>
58
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meternumber }}</p>
59
+ </div>
60
+ <div class="row">
61
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">气表品牌</b></p>
62
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meter_brand }}</p>
63
+ </div>
64
+ <div class="row">
65
+ <p class="col-xs-3 text-left font"><b class="control-label-justify">气表型号</b></p>
66
+ <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meter_style }}</p>
67
+ </div>
68
+ <div class="row text-right">
69
+ <button class="btn btn-info"
70
+ @click.prevent="$parent.$parent.$parent.openModal(row)">
71
+ {{$parent.mark === 1 ? '查看' : '修正'}}
72
+ </button>
73
+ <button class="btn btn-danger"
74
+ @click="$parent.$parent.$parent.deleteUserinfo(row)"
75
+ v-if="$parent.showDeleteUserInfo"
76
+ :disabled="$parent.mark === 1 || row.f_user_state === '正常'">
77
+ 销户
78
+ </button>
79
+ </div>
80
+ </div>
81
+ </div>
82
+ </list>
83
+ </criteria-paged>
84
+ </div>
85
+ <div>
61
86
  <validator name="v">
62
87
  <modal v-if="showModal" :show.sync="showModal" v-ref:modal :large="true" :backdrop="false">
63
88
  <header slot="modal-header" class="modal-header">
@@ -371,11 +396,11 @@ export default {
371
396
  data () {
372
397
  return {
373
398
  showModal: false,
374
- model: {
375
- rows: null
376
- },
399
+ model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyUserinfo`, 10),
400
+ criteriaShow: false,
377
401
  areaList: [],
378
402
  area: {},
403
+ modelCode: '',
379
404
  userinfo: {},
380
405
  userfile: {},
381
406
  meterBrandList: [],
@@ -387,13 +412,25 @@ export default {
387
412
  }
388
413
  },
389
414
  ready () {
415
+ this.copydata()
390
416
  this.search()
391
417
  this.getMeterBrand()
392
418
  this.getAreaList()
393
-
394
419
  this.getScanCodeConfig()
395
420
  },
396
421
  methods: {
422
+ copydata(){
423
+ if(!isEmpty(this.selectdata.f_building)){
424
+ this.$refs.cp.$refs.cri.model.f_building=this.selectdata.f_building
425
+ }
426
+ if(!isEmpty(this.selectdata.f_unit)){
427
+ this.$refs.cp.$refs.cri.model.f_unit=this.selectdata.f_unit
428
+ }
429
+ if(!isEmpty(this.selectdata.f_room)){
430
+ this.$refs.cp.$refs.cri.model.f_room= this.selectdata.f_room
431
+ }
432
+ },
433
+
397
434
  async getScanCodeConfig () {
398
435
  let http = new HttpResetClass()
399
436
  let res = await http.load(
@@ -402,17 +439,41 @@ export default {
402
439
  null,
403
440
  {resolveMsg: null, rejectMsg: '扫码配置获取失败!!!'}
404
441
  )
405
-
406
442
  this.scanCodeConfig = res.data
407
443
  },
408
- scanCode () {
444
+ // 查询
445
+ search() {
446
+ this.$refs.cp.$refs.cri.search();
447
+ },
448
+ searchCondition(args){
449
+ if (this.selectdata.f_apply_type === '分户挂表') {
450
+ args.condition += ` and ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
451
+ }else {
452
+ args.condition += ` and ui.f_process_id = '${this.selectdata.f_process_id}'`
453
+ }
454
+ if(!isEmpty(this.model.f_building)){
455
+ args.condition += " and ui.f_building like '"+this.model.f_building+"%'"
456
+ }
457
+ if(!isEmpty(this.model.f_unit)){
458
+ args.condition+= " and ui.f_unit like '"+this.model.f_unit+"%'"
459
+ }
460
+ if(!isEmpty(this.model.f_room)){
461
+ args.condition += " and ui.f_room like '"+this.model.f_room+"%'"
462
+ }
463
+ this.model.search(args.condition, args.model);
464
+ },
465
+ clear () {
466
+ Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
467
+ this.$refs.cp.$refs.cri.model[key] = null
468
+ })
469
+ },
470
+ async scanCode () {
409
471
  console.log('===============扫码===================')
410
- HostApp.__this__=this,
411
- HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
412
-
413
- this.getCode()
472
+ HostApp.__this__ = this,
473
+ HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
474
+ await this.getCode()
414
475
  },
415
- getCode() {
476
+ async getCode () {
416
477
  let code = HostApp.getCode().data;
417
478
  // let code = '012199312345'
418
479
  console.log('===========扫码结果=============')
@@ -421,7 +482,6 @@ export default {
421
482
  this.$showAlert('表号不符合规则', 'danger', 3000)
422
483
  return
423
484
  }
424
-
425
485
  // 解析厂家
426
486
  let factory = null
427
487
  for (const item of this.scanCodeConfig.factory) {
@@ -435,7 +495,6 @@ export default {
435
495
  return
436
496
  }
437
497
  console.log(factory)
438
-
439
498
  // 解析运营商
440
499
  let ips = null
441
500
  for (const item of this.scanCodeConfig.ips) {
@@ -449,19 +508,39 @@ export default {
449
508
  return
450
509
  }
451
510
  console.log(ips)
511
+ //气表品牌
512
+ if (code.startsWith('01')) {
513
+ var num1 = this.getMeterBrands('金卡NB物联网表')
514
+ this.userfile.f_gasbrand_id = num1
515
+ } else if (code.startsWith('02') || code.startsWith('22')) {
516
+ var num2 = this.getMeterBrands('千嘉NB物联网表')
517
+ this.userfile.f_gasbrand_id = num2
518
+ }
519
+ //气表型号
520
+ if (code.substring(4, 5) == 7) {
521
+ await this.gasbrandValue('JGD1.6-NNB物联网表')
522
+ const value=this.modelCode
523
+ this.userfile.f_gasmodel_id = value
524
+ } else if (code.substring(4, 5) == 8) {
452
525
 
526
+ await this.gasbrandValue('JGD2.5-NNB物联网表')
527
+ const value1=this.modelCode
528
+ this.userfile.f_gasmodel_id =value1
529
+ } else if (code.substring(4, 5) == 9) {
530
+ await this.gasbrandValue('JGD4S-NNB物联网表')
531
+ const value2 =this.modelCode
532
+ this.userfile.f_gasmodel_id = value2
533
+ }
453
534
  // 表向
454
535
  console.log(code.substring(6, 7) % 2 === 0 ? '偶数' : '奇数')
455
536
  console.log(code.substring(6, 7) % 2 === 0 ? '右表' : '左表')
456
537
  this.userfile.f_aroundmeter = code.substring(6, 7) % 2 === 0 ? '右表' : '左表'
457
-
458
538
  // 顺序号
459
539
  console.log(code.substring(7, 12))
460
540
  if (code.substring(7, 12) < this.scanCodeConfig.number.min || code.substring(7, 12) > this.scanCodeConfig.number.max) {
461
541
  this.$showAlert('顺序号超出范围!!!', 'danger', 3000)
462
542
  return
463
543
  }
464
-
465
544
  for (const item of this.meterBrandList) {
466
545
  if (item.label === factory) {
467
546
  // this.userfile.f_gasbrand_id = item.value
@@ -469,11 +548,37 @@ export default {
469
548
  break
470
549
  }
471
550
  }
472
-
473
551
  Vue.set(this.userfile, 'f_meternumber', code)
474
-
475
552
  this.meternumberValidate()
476
553
  },
554
+ async gasbrandValue (name) {
555
+ let data = {
556
+ f_gasbrand_id: this.userfile.f_gasbrand_id
557
+ }
558
+ let http = new HttpResetClass()
559
+ let res = await http.load(
560
+ 'POST',
561
+ `${this.$androidUtil.getProxyUrl()}/rs/sql/getGasModel`,
562
+ {data: data},
563
+ {resolveMsg: null, rejectMsg: '气表型号查询失败!!!'}
564
+ ).then(res => {
565
+ for (const re of res.data) {
566
+ if (re.label == name) {
567
+ this.modelCode= re.value
568
+ return re.value;
569
+ }
570
+ }
571
+ return 'null'
572
+ })
573
+ },
574
+ getMeterBrands (name) {
575
+ for (const brand of this.meterBrandList) {
576
+ if(brand.label==name){
577
+ return brand.value
578
+ }
579
+ }
580
+ return 'null'
581
+ },
477
582
  async deleteUserinfo (row) {
478
583
  this.userinfo = row
479
584
  let res = await this.$showMessage('此操作不可撤回,您确定要删除这条记录吗?')
@@ -519,6 +624,15 @@ export default {
519
624
  resolveMsg: null,
520
625
  rejectMsg: '用户档案添加失败!!!'
521
626
  })
627
+ // this.$showMessage('用户档案添加成功!!!')
628
+ this.$showAlert('用户档案添加成功!!!', 'success', 3000)
629
+ // this.search() 避免分页时,点击确定后,分页返回第一页
630
+ this.showModal= false
631
+ console.log("分页数据",this.model)
632
+ this.selectdata.f_building=this.model.model.f_building
633
+ this.selectdata.f_unit=this.model.model.f_unit
634
+ this.selectdata.f_room=this.model.model.f_room
635
+ this.selectdata.pageIndex=this.model.pageIndex
522
636
  this.$dispatch('breakControl', this.selectdata)
523
637
  },
524
638
  ifDisable() {
@@ -541,7 +655,8 @@ export default {
541
655
  if (this.userfile.f_user_id) {
542
656
  data.f_user_id = this.userfile.f_user_id
543
657
  }
544
- let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/meterbrandsNumberValidate`, {data:data}, {
658
+ let http = new HttpResetClass()
659
+ let res = await http.load("POST",`${this.$androidUtil.getProxyUrl()}/rs/logic/meterbrandsNumberValidate`, {data:data}, {
545
660
  resolveMsg: null,
546
661
  rejectMsg: '表号验证失败!!'
547
662
  })
@@ -662,7 +777,9 @@ export default {
662
777
  if (this.userfile.f_gasmodel_id === 0) {
663
778
  this.userfile.f_gasmodel_id = null
664
779
  }
665
-
780
+ if(isEmpty(this.userfile.f_position)){
781
+ this.userfile.f_position = '室内'
782
+ }
666
783
  if (!isEmpty(this.userfile.f_gasbrand_id)) {
667
784
  let data = {
668
785
  f_gasbrand_id: this.userfile.f_gasbrand_id
@@ -767,25 +884,6 @@ export default {
767
884
  }
768
885
  })
769
886
  },
770
- // 查询
771
- async search () {
772
- let http = new HttpResetClass()
773
- let data = {
774
- condition: null
775
- }
776
- if (this.selectdata.f_apply_type === '分户挂表') {
777
- data.condition = `ui.f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
778
- }else {
779
- data.condition = `ui.f_process_id = '${this.selectdata.f_process_id}'`
780
- }
781
- let res = await http.load('POST',
782
- `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyUserinfo`,
783
- {data:data}, {
784
- resolveMsg: null,
785
- rejectMsg: '获取档案失败!!!'
786
- })
787
- this.model.rows = res.data
788
- },
789
887
  // 关闭安装明细
790
888
  closeUserFile() {
791
889
  this.showModal = false
@@ -864,4 +962,19 @@ export default {
864
962
  border:1px solid #499EDF;
865
963
  padding: 8px;
866
964
  }
965
+ .button_shrink_top {
966
+ width: 34px;
967
+ height: 34px;
968
+ border: solid 1px #6aa6e2;
969
+ background-size: 100%;
970
+ background-image: url("../../../../../static/newStyle/stretch_top.png")
971
+ }
972
+
973
+ .button_shrink_bottom {
974
+ width: 34px;
975
+ height: 34px;
976
+ border: solid 1px #6aa6e2;
977
+ background-size: 100%;
978
+ background-image: url("../../../../../static/newStyle/stretch_bottom.png")
979
+ }
867
980
  </style>