readmeter-changan 1.0.40 → 1.0.43

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 (8) hide show
  1. package/.idea/workspace.xml +5 -6
  2. package/package.json +1 -1
  3. package/src/components/readingmeter/CheckInfo.vue +13 -2
  4. package/src/components/readingmeter/CheckOnline.vue +32 -32
  5. package/src/components/readingmeter/PhoneHandplanInfo.vue +11 -2
  6. package/src/components/readingmeter/UserInfo.vue +220 -219
  7. package/src/components/server/ReadMeterHome.vue +214 -208
  8. package/src/components/server/ReadMeterNavBottom.vue +123 -123
package/.idea/workspace.xml CHANGED
@@ -7,10 +7,7 @@
7
7
  <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
8
8
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
9
  <change beforePath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" afterDir="false" />
10
- <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterHome.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterHome.vue" afterDir="false" />
11
- <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterNavBottom.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterNavBottom.vue" afterDir="false" />
12
- <change beforePath="$PROJECT_DIR$/src/readmeter-android.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/readmeter-android.js" afterDir="false" />
13
- <change beforePath="$PROJECT_DIR$/src/readmeter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/readmeter.js" afterDir="false" />
10
+ <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandplanInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandplanInfo.vue" afterDir="false" />
14
11
  </list>
15
12
  <option name="SHOW_DIALOG" value="false" />
16
13
  <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -240,7 +237,7 @@
240
237
  &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
241
238
  &quot;git-widget-placeholder&quot;: &quot;changan&quot;,
242
239
  &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
243
- &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/ReadMeterClient&quot;,
240
+ &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/TelephoneClient&quot;,
244
241
  &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
245
242
  &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
246
243
  &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -425,7 +422,9 @@
425
422
  <workItem from="1753265804521" duration="1171000" />
426
423
  <workItem from="1753320827001" duration="1546000" />
427
424
  <workItem from="1753927585913" duration="2588000" />
428
- <workItem from="1760685783403" duration="659000" />
425
+ <workItem from="1760685783403" duration="753000" />
426
+ <workItem from="1768962396488" duration="1138000" />
427
+ <workItem from="1769756231076" duration="646000" />
429
428
  </task>
430
429
  <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
431
430
  <created>1553677761707</created>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "readmeter-changan",
3
- "version": "1.0.40",
3
+ "version": "1.0.43",
4
4
  "description": "手机抄表客户端",
5
5
  "author": "15529257852@163.com",
6
6
  "private": false,
package/src/components/readingmeter/CheckInfo.vue CHANGED
@@ -110,12 +110,18 @@
110
110
  <input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
111
111
  </div>
112
112
  </div>
113
- <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
113
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" >
114
114
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">IC卡累计</p>
115
115
  <div class="col-xs-8 col-sm-8 col-md-8 ">
116
116
  <input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
117
117
  </div>
118
118
  </div>
119
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
120
+ <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">本期IC卡底数</p>
121
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
122
+ <input type="text" id="" class="form-control font " v-model="model.f_checkicbase" >
123
+ </div>
124
+ </div>
119
125
  </div>
120
126
  <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
121
127
  <label for="f_insflow" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">瞬时流量</label>
@@ -374,7 +380,7 @@
374
380
  <picture-area :model="model.imgs"></picture-area>
375
381
  </div>
376
382
  <div class="row col-xs-12 col-sm-12 col-md-12 auto mt-20" v-if="!data.hidden">
377
- <div class="col-xs-2 col-sm-2 col-md-2 col-xs-offset-4 col-sm-offset-4 col-md-offset-4" v-if="!data.f_sign">
383
+ <div class="col-xs-2 col-sm-2 col-md-2 col-xs-offset-4 col-sm-offset-4 col-md-offset-4">
378
384
  <button type="button" class="btn btn-lg btn-color btn-font" @click="save()">保存</button>
379
385
  </div>
380
386
  <div class="col-xs-2 col-sm-2 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" >
@@ -419,6 +425,7 @@ export default {
419
425
  f_pressure:'',
420
426
  f_temperature:'',
421
427
  f_new_install:'',
428
+ f_checkic1:'',
422
429
  f_result_state:'',
423
430
  f_check_result_state:'',
424
431
  f_check_install:'',
@@ -439,6 +446,7 @@ export default {
439
446
  f_weekcheckicdishu:'',
440
447
  f_oughtamount: 0,
441
448
  f_new_lcd:0,
449
+ f_checkicbase:0,
442
450
  f_curbalance:0,
443
451
  f_meter_repair:0,
444
452
  f_card_repair:0,
@@ -691,6 +699,9 @@ export default {
691
699
  this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
692
700
  return
693
701
  }
702
+ if(!this.model.f_checkic1){
703
+ this.$showMessage('请输入IC卡累计！！！')
704
+ }
694
705
  if(this.model.f_check_install){
695
706
  this.model.f_weekcheck = 1
696
707
  }
package/src/components/readingmeter/CheckOnline.vue CHANGED
@@ -4,63 +4,63 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
5
5
  <div partial>
6
6
  <form>
7
- <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
8
- <div class="col-xs-4 col-sm-4 col-md-4">
7
+ <div class="row col-xs-6 col-sm-6 col-md-6 app-row">
8
+ <div class="col-xs-6 col-sm-6 col-md-6">
9
9
  <img src="../../assets/卡号.png" style="width: 20px;margin-bottom: 5px" alt="">
10
10
  <label class="font text-left">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
11
11
  </div>
12
- <div class="col-xs-8 col-sm-8 col-md-8" >
12
+ <div class="col-xs-6 col-sm-6 col-md-6" >
13
13
  <input class="search_input input-font"
14
14
  v-model=model.f_card_id condition="f_card_id = '{}'" placeholder="请输入卡号" />
15
15
  </div>
16
16
  </div>
17
- <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
18
- <div class="col-xs-4 col-sm-4 col-md-4">
17
+ <div class="row col-xs-6 col-sm-6 col-md-6 app-row">
18
+ <div class="col-xs-6 col-sm-6 col-md-6">
19
19
  <img src="../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
20
20
  <label class="font text-left">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
21
21
  </div>
22
- <div class="col-xs-8 col-sm-8 col-md-8" >
22
+ <div class="col-xs-6 col-sm-6 col-md-6" >
23
23
  <input class="search_input input-font"
24
24
  v-model=model.f_meternumber condition="f_meternumber = '{}'" placeholder="请输入表号" />
25
25
  </div>
26
26
  </div>
27
- <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
28
- <div class="col-xs-4 col-sm-4 col-md-4">
27
+ <div class="row col-xs-6 col-sm-6 col-md-6 app-row">
28
+ <div class="col-xs-6 col-sm-6 col-md-6">
29
29
  <img src="../../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
30
30
  <label class="font text-left">用户名称：</label>
31
31
  </div>
32
- <div class="col-xs-8 col-sm-8 col-md-8" >
32
+ <div class="col-xs-6 col-sm-6 col-md-6" >
33
33
  <input class="search_input input-font" condition="f_user_name like '%{}%'" v-model="model.f_username" placeholder="请输入用户名称">
34
34
  </div>
35
35
  </div>
36
- <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
37
- <div class="col-xs-4 col-sm-4 col-md-4">
36
+ <div class="row col-xs-6 col-sm-6 col-md-6 app-row">
37
+ <div class="col-xs-6 col-sm-6 col-md-6">
38
38
  <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
39
39
  <label class="font text-left">小区名称：</label>
40
40
  </div>
41
- <div class="col-xs-8 col-sm-8 col-md-8" >
41
+ <div class="col-xs-6 col-sm-6 col-md-6" >
42
42
  <input style="width: 100%" condition="f_residential_area like '%{}%'" class="search_input input-font" v-model="model.f_residential_area" placeholder="请输入用户小区（可模糊查询）">
43
43
  </div>
44
44
  </div>
45
- <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
46
- <div class="col-xs-4 col-sm-4 col-md-4">
47
- <img src="../../assets/街道.png" style="width: 20px;margin-bottom: 5px" alt="">
48
- <label class="font text-left">街&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;道：</label>
49
- </div>
50
- <div class="col-xs-8 col-sm-8 col-md-8" >
51
- <input style="width: 100%" class="search_input input-font" condition="f_street like '{}%'" v-model="model.f_street" placeholder="请输入用户单元">
52
- </div>
53
- </div>
54
- <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
55
- <div class="col-xs-4 col-sm-4 col-md-4">
56
- <img src="../../assets/地址.png" style="width: 20px;margin-bottom: 5px" alt="">
57
- <label class="font text-left">用户地址：</label>
58
- </div>
59
- <div class="col-xs-8 col-sm-8 col-md-8" >
60
- <input style="width: 100%" condition="f_address like '%{}%'" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
61
- </div>
62
- </div>
63
- <div class="row col-xs-12 col-sm-12 col-md-6 text-center" style="margin-top: 20px;">
45
+ <!-- <div class="row col-xs-6 col-sm-6 col-md-6 app-row">-->
46
+ <!-- <div class="col-xs-6 col-sm-6 col-md-6">-->
47
+ <!-- <img src="../../assets/街道.png" style="width: 20px;margin-bottom: 5px" alt="">-->
48
+ <!-- <label class="font text-left">街&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;道：</label>-->
49
+ <!-- </div>-->
50
+ <!-- <div class="col-xs-6 col-sm-6 col-md-6" >-->
51
+ <!-- <input style="width: 100%" class="search_input input-font" condition="f_street like '{}%'" v-model="model.f_street" placeholder="请输入用户单元">-->
52
+ <!-- </div>-->
53
+ <!-- </div>-->
54
+ <!-- <div class="row col-xs-6 col-sm-6 col-md-6 app-row">-->
55
+ <!-- <div class="col-xs-6 col-sm-6 col-md-6">-->
56
+ <!-- <img src="../../assets/地址.png" style="width: 20px;margin-bottom: 5px" alt="">-->
57
+ <!-- <label class="font text-left">用户地址：</label>-->
58
+ <!-- </div>-->
59
+ <!-- <div class="col-xs-6 col-sm-6 col-md-6" >-->
60
+ <!-- <input style="width: 100%" condition="f_address like '%{}%'" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">-->
61
+ <!-- </div>-->
62
+ <!-- </div>-->
63
+ <div class="row col-xs-6 col-sm-12 col-md-6 text-center" style="margin-top: 20px;">
64
64
  <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
65
65
  </div>
66
66
  <div style="height:30px;"></div>
@@ -114,7 +114,7 @@
114
114
  </div>
115
115
  </list>
116
116
  </criteria-paged>
117
- <back-page :need-back='true' @flag="$back()"></back-page>
117
+ <!-- <back-page :need-back='true' @flag="$back()"></back-page>-->
118
118
  </div>
119
119
  </template>
120
120
 
package/src/components/readingmeter/PhoneHandplanInfo.vue CHANGED
@@ -110,12 +110,18 @@
110
110
  <input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
111
111
  </div>
112
112
  </div>
113
- <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
113
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" >
114
114
  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">IC卡累计</p>
115
115
  <div class="col-xs-8 col-sm-8 col-md-8 ">
116
116
  <input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
117
117
  </div>
118
118
  </div>
119
+ <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
120
+ <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">本期IC卡底数</p>
121
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
122
+ <input type="text" id="" class="form-control font " v-model="model.f_checkicbase" >
123
+ </div>
124
+ </div>
119
125
  </div>
120
126
  <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
121
127
  <label for="f_insflow" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">瞬时流量</label>
@@ -286,6 +292,7 @@
286
292
  f_weekcheckicnum:'',
287
293
  f_checkic:'',
288
294
  f_checkic1:'',
295
+ f_checkicbase:'',
289
296
  f_real_balance:'',
290
297
  f_weekchecksn:'',
291
298
  f_weekchecknum:'',
@@ -514,7 +521,9 @@
514
521
  // },
515
522
 
516
523
  commit () {
517
-
524
+ if(!this.model.f_checkic1){
525
+ this.$showMessage('请输入IC卡累计！！！')
526
+ }
518
527
 
519
528
  if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
520
529
  if (this.f_weektablesnapsgas < 0 && this.model.f_if_change!=='是') {