readmeter-changan 1.0.29 → 1.0.31

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 (9) hide show
  1. package/.npmignore +7 -0
  2. package/package.json +1 -1
  3. package/src/assets/brand.png +0 -0
  4. package/src/components/readingmeter/CheckInfo.vue +20 -1
  5. package/src/components/readingmeter/MeterInfo.vue +33 -7
  6. package/src/components/readingmeter/PhoneHandplanInfo.vue +20 -1
  7. package/src/components/readingmeter/ReadMeterInfo.vue +43 -11
  8. package/src/components/readingmeter/UserInfo.vue +25 -25
  9. package/yarn.lock +7818 -0
package/.npmignore ADDED
@@ -0,0 +1,7 @@
1
+ .DS_Store
2
+ node_modules/
3
+ dist/static/*.map
4
+ npm-debug.log
5
+ selenium-debug.log
6
+ test/unit/coverage
7
+ test/e2e/reports
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "readmeter-changan",
3
- "version": "1.0.29",
3
+ "version": "1.0.31",
4
4
  "description": "手机抄表客户端",
5
5
  "author": "15529257852@163.com",
6
6
  "private": false,
package/src/assets/brand.png ADDED
Binary file
package/src/components/readingmeter/CheckInfo.vue CHANGED
@@ -93,7 +93,7 @@
93
93
  <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
94
94
  <label for="f_curbalance" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡剩余金额</label>
95
95
  <div class="col-xs-8 col-sm-6 col-md-6 ">
96
- <input type="number" id="f_curbalance" class="form-control font " v-model="model.f_curbalance" >
96
+ <input type="number" id="f_curbalance" class="form-control font " v-model="model.f_curbalance" @blur="getMoneyMessage()" >
97
97
  </div>
98
98
  </div>
99
99
 
@@ -365,6 +365,25 @@
365
365
  this.$goto('hand-sell-history', {model: this.model,showmessage:this.showmessage,temp:'check-info'}, 'list')
366
366
  },
367
367
  //获取ic卡表数据
368
+ getMoneyMessage(){
369
+ if (this.model.f_curbalance === '' || this.model.f_curbalance === undefined) {
370
+ this.$showMessage('请检查你录入的金额')
371
+ return
372
+ }
373
+ this.model.f_new_lcd = parseInt(this.model.f_curbalance / this.model.f_price)
374
+ this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
375
+ this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
376
+ let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
377
+ this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
378
+ this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
379
+ console.log('本期已充'+this.model.f_hascharge)
380
+ this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
381
+ this.model.f_icsnapsgas = (parseInt(this.model.f_last_lcd)+ parseInt(this.model.f_hascharge)+parseInt(this.model.f_card_repair)- parseInt(this.model.f_new_lcd))
382
+ console.log('IC走气'+this.model.f_icsnapsgas)
383
+ this.model.f_result_state = res.f_result_state
384
+ console.log('抄表状态'+this.model.f_result_state)
385
+ this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
386
+ },
368
387
  getCardMessage(){
369
388
  if (this.model.f_new_lcd === '' || this.model.f_new_lcd === undefined) {
370
389
  this.$showMessage('请检查你录入的液晶示数')
package/src/components/readingmeter/MeterInfo.vue CHANGED
@@ -9,18 +9,44 @@
9
9
  <p class="col-xs-4 col-sm-4 col-md-4 text-left font">基表编号</p>
10
10
  <p class="col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_meternumber}}</p>
11
11
  </div>
12
+ <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row">
13
+ <p class="col-xs-4 col-sm-4 col-md-4 text-left font">基表表号</p>
14
+ <p class="col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_jb_meternumber}}</p>
15
+ </div>
16
+ <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row">
17
+ <p class="col-xs-4 col-sm-4 col-md-4 text-left font">生产型号</p>
18
+ <p class="col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_production}}</p>
19
+ </div>
20
+ <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row">
21
+ <p class="col-xs-4 col-sm-4 col-md-4 text-left font">生产时间</p>
22
+ <p class="col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_basetabletime}}</p>
23
+ </div>
24
+ <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row">
25
+ <p class="col-xs-4 col-sm-4 col-md-4 text-left font">流量范围</p>
26
+ <p class="col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_flow_range}}</p>
27
+ </div>
12
28
  <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
13
29
 
14
- <p class=" col-xs-4 col-sm-4 col-md-4 text-left font">基表类型</p>
30
+ <p class=" col-xs-4 col-sm-4 col-md-4 text-left font">气表品牌</p>
15
31
  <p class=" col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_meter_brand }}</p>
16
32
  </div>
33
+ <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
34
+
35
+ <p class=" col-xs-4 col-sm-4 col-md-4 text-left font">气表型号</p>
36
+ <p class=" col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_meter_style }}</p>
37
+ </div>
38
+ <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
39
+
40
+ <p class=" col-xs-4 col-sm-4 col-md-4 text-left font">基表类型</p>
41
+ <p class=" col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_jb_type }}</p>
42
+ </div>
17
43
  <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
18
44
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">基表厂家</p>
19
- <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_manufacturers}}</p>
45
+ <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_jb_factory}}</p>
20
46
  </div>
21
47
  <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
22
48
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">基表型号</p>
23
- <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_meter_style }}</p>
49
+ <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_jb_type_code }}</p>
24
50
  </div>
25
51
  <!--<div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">-->
26
52
  <!--<p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">生产时间</p>-->
@@ -34,10 +60,10 @@
34
60
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">安装位置</p>
35
61
  <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_position }}</p>
36
62
  </div>
37
- <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
38
- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">计量方式</p>
39
- <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_meter_classify }}</p>
40
- </div>
63
+ <!-- <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">-->
64
+ <!-- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">计量方式</p>-->
65
+ <!-- <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_meter_classify }}</p>-->
66
+ <!-- </div>-->
41
67
  <div class=" col-xs-12 col-sm-6 col-md-6 row auto app-row">
42
68
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">气价</p>
43
69
  <p class="panel-title col-xs-8 col-sm-8 col-md-8 show-font">{{ model.f_price }}</p>
package/src/components/readingmeter/PhoneHandplanInfo.vue CHANGED
@@ -93,7 +93,7 @@
93
93
  <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row " v-if="model.f_meter_classify!=='机表'">
94
94
  <label for="f_curbalance" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡剩余金额</label>
95
95
  <div class="col-xs-8 col-sm-6 col-md-6 ">
96
- <input type="text" id="f_curbalance" class="form-control font " v-model="model.f_curbalance" >
96
+ <input type="text" id="f_curbalance" class="form-control font " @blur="getMoneyMessage()" v-model="model.f_curbalance" >
97
97
  </div>
98
98
  </div>
99
99
 
@@ -355,6 +355,25 @@
355
355
  getSumGas(){
356
356
  this.$goto('hand-sell-history', {model: this.model,showmessage:this.showmessage,temp:'phone-handplan-info'}, 'list')
357
357
  },
358
+ getMoneyMessage(){
359
+ if (this.model.f_curbalance === '' || this.model.f_curbalance === undefined) {
360
+ this.$showMessage('请检查你录入的金额')
361
+ return
362
+ }
363
+ this.model.f_new_lcd = parseInt(this.model.f_curbalance / this.model.f_price)
364
+ this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
365
+ this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
366
+ let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
367
+ this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
368
+ this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
369
+ console.log('本期已充'+this.model.f_hascharge)
370
+ this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
371
+ this.model.f_icsnapsgas = (parseInt(this.model.f_last_lcd)+ parseInt(this.model.f_hascharge)+parseInt(this.model.f_card_repair)- parseInt(this.model.f_new_lcd))
372
+ console.log('IC走气'+this.model.f_icsnapsgas)
373
+ this.model.f_result_state = res.f_result_state
374
+ console.log('抄表状态'+this.model.f_result_state)
375
+ this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
376
+ },
358
377
  //获取ic卡表数据
359
378
  getCardMessage(){
360
379
  if (this.model.f_new_lcd === '' || this.model.f_new_lcd === undefined) {
package/src/components/readingmeter/ReadMeterInfo.vue CHANGED
@@ -1,17 +1,6 @@
1
1
  <template>
2
2
  <div class="row" style="padding: 10px">
3
3
  <div class="row" style="overflow: auto">
4
- <!--<div class=" row auto app-row col-xs-12 col-sm-6 col-md-6">-->
5
- <!--&lt;!&ndash;<div class="row app-row col-xs-12 col-sm-6 col-md-6">&ndash;&gt;-->
6
- <!--<div class=" col-xs-4 col-sm-4 col-md-4 col-sm-4 col-md-4" style="margin-bottom: 6px">-->
7
- <!--<img src="../../assets/户编号.png" style="margin-bottom: 5px;width: 32px" alt="">-->
8
- <!--<span class="text-left font">户编号</span>-->
9
- <!--</div>-->
10
- <!--<div class="col-xs-8 col-sm-8 col-md-8 col-sm-8 col-md-8">-->
11
- <!--<input type="number" class="search_input input-font" v-model="model.f_userinfo_code" placeholder="请输入用户编号"/>-->
12
- <!--</div>-->
13
- <!--&lt;!&ndash;</div>&ndash;&gt;-->
14
- <!--</div>-->
15
4
  <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row ">
16
5
  <div class=" col-xs-4 col-sm-4 col-md-4" style="margin-bottom: 6px">
17
6
  <img src="../../assets/姓名.png" style="margin-bottom: 5px;width: 32px" alt="">
@@ -21,6 +10,7 @@
21
10
  <input type="text" class="search_input input-font" v-model="model.f_user_name" placeholder="请输入用户姓名"/>
22
11
  </div>
23
12
  </div>
13
+
24
14
  <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row ">
25
15
  <div class=" col-xs-4 col-sm-4 col-md-4" style="margin-bottom: 6px">
26
16
  <img src="../../assets/卡号.png" style="margin-bottom: 5px;width: 32px" alt="">
@@ -48,6 +38,24 @@
48
38
  <input type="text" class="search_input input-font" v-model="model.f_point_name" placeholder="请输入用气点"/>
49
39
  </div>
50
40
  </div>
41
+ <div class="col-xs-12 col-sm-6 col-md-6 row auto app-row ">
42
+ <div class=" col-xs-4 col-sm-4 col-md-4" style="margin-bottom: 6px">
43
+ <img src="../../assets/brand.png" style="margin-bottom: 5px;width: 32px" alt="">
44
+ <span class="text-left font">气表品牌</span>
45
+ </div>
46
+ <div class="col-xs-8 col-sm-8 col-md-8">
47
+ <v-select
48
+ :value.sync="model.f_meter_brand"
49
+ v-model="model.f_meter_brand"
50
+ :options="meterBrand"
51
+ placeholder="气表品牌"
52
+ :value-single="true"
53
+ width="90%"
54
+ close-on-select
55
+ v-el:cc
56
+ ></v-select>
57
+ </div>
58
+ </div>
51
59
  <div class="row app-row auto col-xs-12 col-sm-6 col-md-6">
52
60
  <div class=" col-xs-4 col-sm-4 col-md-4" style="margin-bottom: 6px">
53
61
  <img src="../../assets/户电话.png" style="margin-bottom: 5px;width: 32px" alt="">
@@ -181,6 +189,7 @@
181
189
  return {
182
190
  model: {
183
191
  f_userinfo_code: '',
192
+ f_meter_brand:'',
184
193
  f_userinfo_id: '',
185
194
  f_user_name: '',
186
195
  f_user_phone: '',
@@ -190,6 +199,29 @@
190
199
  },
191
200
  show: false,
192
201
  handcount: 0,
202
+ meterBrand:[
203
+ {label:'全部',value:''},
204
+ {label:'莱德非接触',value:'莱德非接触'},
205
+ {label:'秦港',value:'秦港'},
206
+ {label:'秦港民用无线',value:'秦港民用无线'},
207
+ {label:'莱德物联网表',value:'莱德物联网表'},
208
+ {label:'秦川',value:'秦川'},
209
+ {label:'067非接触',value:'067非接触'},
210
+ {label:'秦港工业无线',value:'秦港工业无线'},
211
+ {label:'赛福',value:'赛福'},
212
+ {label:'天庆',value:'天庆'},
213
+ {label:'秦港工业',value:'秦港工业'},
214
+ {label:'手抄表',value:'手抄表'},
215
+ {label:'秦岭山水莱德普表',value:'秦岭山水莱德普表'},
216
+ {label:'华捷普通(10)',value:'华捷普通(10)'},
217
+ {label:'华捷加密(12)',value:'华捷加密(12)'},
218
+ {label:'华捷加密(10)',value:'华捷加密(10)'},
219
+ {label:'华捷普通(12)',value:'华捷普通(12)'},
220
+ {label:'工业无线',value:'工业无线'},
221
+ {label:'天然气无线',value:'天然气无线'},
222
+ {label:'致力老表',value:'致力老表'},
223
+ {label:'莱德工业物联网',value:'莱德工业物联网'}
224
+ ],
193
225
  userInfo: {},
194
226
  currentPage: 1,
195
227
  totalPage: 0,
package/src/components/readingmeter/UserInfo.vue CHANGED
@@ -60,11 +60,11 @@
60
60
  <!--<p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">单位编码</p>-->
61
61
  <!--<p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left show-font">{{ model.f_unitid }}</p>-->
62
62
  <!--</div>-->
63
- <div class="row auto app-row col-xs-12 col-sm-12 col-md-12">
64
- <p class="panel-title col-xs-4 col-sm-2 col-md-2 text-left font">客户地址</p>
65
- <p class="panel-title col-xs-8 col-sm-10 col-md-10 text-left show-font">{{ model.f_address
66
- }}{{model.f_address_detail}}</p>
67
- </div>
63
+ <!-- <div class="row auto app-row col-xs-12 col-sm-12 col-md-12">-->
64
+ <!-- <p class="panel-title col-xs-4 col-sm-2 col-md-2 text-left font">客户地址</p>-->
65
+ <!-- <p class="panel-title col-xs-8 col-sm-10 col-md-10 text-left show-font">{{ model.f_address-->
66
+ <!-- }}{{model.f_address_detail}}</p>-->
67
+ <!-- </div>-->
68
68
  <!--<div class="row auto app-row col-xs-12 col-sm-6 col-md-6">-->
69
69
  <!--<p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">客服档案地址</p>-->
70
70
  <!--<p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left show-font">{{ model.f_customersarchives}}</p>-->
@@ -79,14 +79,14 @@
79
79
  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left show-font">{{ model.f_user_type }}</p>
80
80
  </div>
81
81
  <div class="col-xs-12 col-sm-12 col-md-12 auto bg-white">
82
- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">
83
- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">安全等级</p>
84
- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_safelevel }}</p>
85
- </div>
86
- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">
87
- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">网格编号</p>
88
- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_grid_code }}</p>
89
- </div>
82
+ <!-- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">-->
83
+ <!-- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">安全等级</p>-->
84
+ <!-- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_safelevel }}</p>-->
85
+ <!-- </div>-->
86
+ <!-- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">-->
87
+ <!-- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">网格编号</p>-->
88
+ <!-- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_grid_code }}</p>-->
89
+ <!-- </div>-->
90
90
 
91
91
  <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">
92
92
  <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">设备用途</p>
@@ -94,24 +94,24 @@
94
94
  </div>
95
95
  </div>
96
96
  <div class="col-xs-12 col-sm-12 col-md-12 auto bg-white">
97
- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">
98
- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">小时耗气量</p>
99
- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_consumption}}</p>
100
- </div>
97
+ <!-- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">-->
98
+ <!-- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">小时耗气量</p>-->
99
+ <!-- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_consumption}}</p>-->
100
+ <!-- </div>-->
101
101
  <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">
102
102
  <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">设备负荷</p>
103
103
  <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_equipmentload }}</p>
104
104
  </div>
105
- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">
106
- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">日使用时长</p>
107
- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_daytime }}</p>
108
- </div>
105
+ <!-- <div class="row auto app-row col-xs-12 col-sm-4 col-md-4">-->
106
+ <!-- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">日使用时长</p>-->
107
+ <!-- <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left show-font">{{ model.f_daytime }}</p>-->
108
+ <!-- </div>-->
109
109
  </div>
110
110
  <div class="col-xs-12 col-sm-12 col-md-12 auto bg-white">
111
- <div class="row auto app-row col-xs-12 col-sm-6 col-md-6">
112
- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">开户时间</p>
113
- <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left show-font">{{ model.f_createfile_date }}</p>
114
- </div>
111
+ <!-- <div class="row auto app-row col-xs-12 col-sm-6 col-md-6">-->
112
+ <!-- <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">开户时间</p>-->
113
+ <!-- <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left show-font">{{ model.f_createfile_date }}</p>-->
114
+ <!-- </div>-->
115
115
  <div class="row auto app-row col-xs-12 col-sm-6 col-md-6 ">
116
116
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">点火时间</p>
117
117
  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left show-font">{{ model.f_gas_date }}</p>