readmeter-changan 1.0.37 → 1.0.38

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 (3) hide show
  1. package/.idea/workspace.xml +47 -22
  2. package/package.json +1 -1
  3. package/src/components/readingmeter/CheckInfo.vue +500 -485
package/.idea/workspace.xml CHANGED
@@ -1,5 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
+ <component name="AutoImportSettings">
4
+ <option name="autoReloadType" value="SELECTIVE" />
5
+ </component>
3
6
  <component name="ChangeListManager">
4
7
  <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
5
8
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
@@ -163,6 +166,9 @@
163
166
  <path value="$PROJECT_DIR$/package.json" />
164
167
  </packageJsonPaths>
165
168
  </component>
169
+ <component name="ProjectColorInfo">{
170
+ &quot;associatedIndex&quot;: 2
171
+ }</component>
166
172
  <component name="ProjectFrameBounds" extendedState="6">
167
173
  <option name="x" value="-8" />
168
174
  <option name="y" value="-8" />
@@ -223,14 +229,22 @@
223
229
  <option name="hideEmptyMiddlePackages" value="true" />
224
230
  <option name="showLibraryContents" value="true" />
225
231
  </component>
226
- <component name="PropertiesComponent">{
227
- &quot;keyToString&quot;: {
228
- &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
229
- &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/ReadMeterClient&quot;,
230
- &quot;nodejs_package_manager_path&quot;: &quot;yarn&quot;,
231
- &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
232
+ <component name="PropertiesComponent"><![CDATA[{
233
+ "keyToString": {
234
+ "RunOnceActivity.ShowReadmeOnStart": "true",
235
+ "WebServerToolWindowFactoryState": "false",
236
+ "git-widget-placeholder": "changan",
237
+ "kotlin-language-version-configured": "true",
238
+ "last_opened_file_path": "D:/WorkSpace/module/ReadMeterClient",
239
+ "node.js.detected.package.eslint": "true",
240
+ "node.js.detected.package.tslint": "true",
241
+ "node.js.selected.package.eslint": "(autodetect)",
242
+ "node.js.selected.package.tslint": "(autodetect)",
243
+ "nodejs_package_manager_path": "yarn",
244
+ "ts.external.directory.path": "C:\\Program Files\\JetBrains\\IntelliJ IDEA 2024.1.2\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external",
245
+ "vue.rearranger.settings.migration": "true"
232
246
  }
233
- }</component>
247
+ }]]></component>
234
248
  <component name="RecentsManager">
235
249
  <key name="CopyFile.RECENT_KEYS">
236
250
  <recent name="F:\WorkSpace\ReadMeterClient\src\components\server" />
@@ -291,6 +305,14 @@
291
305
  </list>
292
306
  </recent_temporary>
293
307
  </component>
308
+ <component name="SharedIndexes">
309
+ <attachedChunks>
310
+ <set>
311
+ <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
312
+ <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
313
+ </set>
314
+ </attachedChunks>
315
+ </component>
294
316
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
295
317
  <component name="SvnConfiguration">
296
318
  <configuration />
@@ -390,6 +412,9 @@
390
412
  <workItem from="1716450078610" duration="20000" />
391
413
  <workItem from="1716544621445" duration="650000" />
392
414
  <workItem from="1716774878936" duration="1241000" />
415
+ <workItem from="1752048487894" duration="2137000" />
416
+ <workItem from="1752111008561" duration="62000" />
417
+ <workItem from="1752126323817" duration="15000" />
393
418
  </task>
394
419
  <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
395
420
  <created>1553677761707</created>
@@ -486,6 +511,21 @@
486
511
  <option name="version" value="3" />
487
512
  </component>
488
513
  <component name="Vcs.Log.Tabs.Properties">
514
+ <option name="RECENT_FILTERS">
515
+ <map>
516
+ <entry key="Branch">
517
+ <value>
518
+ <list>
519
+ <RecentGroup>
520
+ <option name="FILTER_VALUES">
521
+ <option value="origin/changan" />
522
+ </option>
523
+ </RecentGroup>
524
+ </list>
525
+ </value>
526
+ </entry>
527
+ </map>
528
+ </option>
489
529
  <option name="TAB_STATES">
490
530
  <map>
491
531
  <entry key="MAIN">
@@ -507,21 +547,6 @@
507
547
  </entry>
508
548
  </map>
509
549
  </option>
510
- <option name="RECENT_FILTERS">
511
- <map>
512
- <entry key="Branch">
513
- <value>
514
- <list>
515
- <RecentGroup>
516
- <option name="FILTER_VALUES">
517
- <option value="origin/changan" />
518
- </option>
519
- </RecentGroup>
520
- </list>
521
- </value>
522
- </entry>
523
- </map>
524
- </option>
525
550
  </component>
526
551
  <component name="VcsManagerConfiguration">
527
552
  <ignored-roots>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "readmeter-changan",
3
- "version": "1.0.37",
3
+ "version": "1.0.38",
4
4
  "description": "手机抄表客户端",
5
5
  "author": "15529257852@163.com",
6
6
  "private": false,
package/src/components/readingmeter/CheckInfo.vue CHANGED
@@ -50,66 +50,66 @@
50
50
  <p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left font">{{ model.f_hasnotcharge }}</p>
51
51
  </div>
52
52
  <div class="row auto app-row col-xs-12 col-sm-12 col-md-12 bg-white ">
53
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
54
- <label for="f_new_tablebase" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">基表底数</label>
55
- <div class="col-xs-8 col-sm-6 col-md-6 ">
56
- <input type="number" id="f_new_tablebase" class="form-control font " v-el:f_new_tablebase @blur="getMeterMessage()" v-model="model.f_new_tablebase" v-next-el="f_new_lcd">
53
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
54
+ <label for="f_new_tablebase" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">基表底数</label>
55
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
56
+ <input type="number" id="f_new_tablebase" class="form-control font " v-el:f_new_tablebase @blur="getMeterMessage()" v-model="model.f_new_tablebase" v-next-el="f_new_lcd">
57
+ </div>
57
58
  </div>
58
- </div>
59
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
60
- <label for="f_tablesnapsgas" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">基表走气量</label>
61
- <div class="col-xs-8 col-sm-6 col-md-6 ">
62
- <input type="number" id="f_card_id" class="form-control font " v-model="model.f_tablesnapsgas" readonly>
59
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
60
+ <label for="f_tablesnapsgas" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">基表走气量</label>
61
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
62
+ <input type="number" id="f_card_id" class="form-control font " v-model="model.f_tablesnapsgas" readonly>
63
+ </div>
63
64
  </div>
64
- </div>
65
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
66
- <label for="f_meter_repair" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">表维修</label>
67
- <div class="col-xs-8 col-sm-6 col-md-6 ">
68
- <input type="number" id="f_meter_repair" class="form-control font " v-model="model.f_meter_repair" readonly>
65
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
66
+ <label for="f_meter_repair" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">表维修</label>
67
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
68
+ <input type="number" id="f_meter_repair" class="form-control font " v-model="model.f_meter_repair" readonly>
69
+ </div>
69
70
  </div>
70
71
  </div>
71
- </div>
72
72
  <div class="row auto app-row col-xs-12 col-sm-12 col-md-12 bg-white ">
73
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
74
- <label for="f_new_tablebase" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡剩余气量</label>
75
- <div class="col-xs-8 col-sm-6 col-md-6 ">
76
- <input type="number" id="f_new_lcd" class="form-control font " v-el:f_new_lcd @blur="getCardMessage()" v-model="model.f_new_lcd" v-next-el="f_insflow">
73
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
74
+ <label for="f_new_tablebase" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡剩余气量</label>
75
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
76
+ <input type="number" id="f_new_lcd" class="form-control font " v-el:f_new_lcd @blur="getCardMessage()" v-model="model.f_new_lcd" v-next-el="f_insflow">
77
+ </div>
77
78
  </div>
78
- </div>
79
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
80
- <label for="f_icsnapsgas" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">IC卡扣气量</label>
81
- <div class="col-xs-8 col-sm-6 col-md-6 ">
82
- <input type="number" id="f_icsnapsgas" class="form-control font " v-model="model.f_icsnapsgas" readonly>
79
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
80
+ <label for="f_icsnapsgas" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">IC卡扣气量</label>
81
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
82
+ <input type="number" id="f_icsnapsgas" class="form-control font " v-model="model.f_icsnapsgas" readonly>
83
+ </div>
83
84
  </div>
84
- </div>
85
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
86
- <label for="f_card_repair" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡维修</label>
87
- <div class="col-xs-8 col-sm-6 col-md-6 ">
88
- <input type="number" id="f_card_repair" class="form-control font " v-model="model.f_card_repair" readonly>
85
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
86
+ <label for="f_card_repair" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡维修</label>
87
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
88
+ <input type="number" id="f_card_repair" class="form-control font " v-model="model.f_card_repair" readonly>
89
+ </div>
89
90
  </div>
90
91
  </div>
91
- </div>
92
92
  <div class="row auto app-row col-xs-12 col-sm-12 col-md-12 bg-white ">
93
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
94
- <label for="f_curbalance" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡剩余金额</label>
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" @blur="getMoneyMessage()" >
93
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
94
+ <label for="f_curbalance" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">卡剩余金额</label>
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" @blur="getMoneyMessage()" >
97
+ </div>
97
98
  </div>
98
- </div>
99
99
 
100
- <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
101
- <label for="f_datacomparison" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">数据对比</label>
102
- <div class="col-xs-8 col-sm-6 col-md-6 ">
103
- <input type="number" id="f_datacomparison" class="form-control font " v-model="model.f_datacomparison" readonly>
100
+ <div class="auto col-xs-12 col-sm-4 col-md-4 bg-white app-row ">
101
+ <label for="f_datacomparison" class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">数据对比</label>
102
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
103
+ <input type="number" id="f_datacomparison" class="form-control font " v-model="model.f_datacomparison" readonly>
104
+ </div>
104
105
  </div>
105
- </div>
106
- <div class="row auto bg-white app-row col-xs-12 col-sm-4 col-md-4">
107
- <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">抄表状态</p>
108
- <!--<p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left font">{{ model.f_result_state}}</p>-->
109
- <div class="col-xs-8 col-sm-6 col-md-6 ">
110
- <input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
106
+ <div class="row auto bg-white app-row col-xs-12 col-sm-4 col-md-4">
107
+ <p class="panel-title col-xs-4 col-sm-6 col-md-6 text-left font">抄表状态</p>
108
+ <!--<p class="panel-title col-xs-8 col-sm-6 col-md-6 text-left font">{{ model.f_result_state}}</p>-->
109
+ <div class="col-xs-8 col-sm-6 col-md-6 ">
110
+ <input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
111
+ </div>
111
112
  </div>
112
- </div>
113
113
  <div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" v-if="showic1">
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 ">
@@ -231,12 +231,12 @@
231
231
  <input type="number" id="f_weekchecknum" class="form-control font " v-el:f_weekchecknum v-model="model.f_weekchecknum" v-next-el="f_weekcheckicnum">
232
232
  </div>
233
233
  </div>
234
- <!-- <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">-->
235
- <!-- <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表IC卡累计底数</label>-->
236
- <!-- <div class="col-xs-8 col-sm-8 col-md-8 ">-->
237
- <!-- <input type="number" id="f_weekcheckcardnum" class="form-control font " v-el:f_weekchecknum v-model="model.f_weekcheckcardnum" v-next-el="f_weekcheckicnum">-->
238
- <!-- </div>-->
239
- <!-- </div>-->
234
+ <!-- <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">-->
235
+ <!-- <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表IC卡累计底数</label>-->
236
+ <!-- <div class="col-xs-8 col-sm-8 col-md-8 ">-->
237
+ <!-- <input type="number" id="f_weekcheckcardnum" class="form-control font " v-el:f_weekchecknum v-model="model.f_weekcheckcardnum" v-next-el="f_weekcheckicnum">-->
238
+ <!-- </div>-->
239
+ <!-- </div>-->
240
240
  <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
241
241
  <label for="f_weekcheckicnum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时剩余气量</label>
242
242
  <div class="col-xs-8 col-sm-8 col-md-8 ">
@@ -246,37 +246,37 @@
246
246
  </div>
247
247
 
248
248
  <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
249
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时间</label>
250
- <div class="col-xs-8 col-sm-8 col-md-8 ">
251
- <datepicker
252
- :value.sync="model.f_weekchecktime"
253
- :format="'yyyy-MM-dd HH:mm:ss'"
254
- v-model="model.f_weekchecktime"
255
- :show-reset-button="reset" placeholder="替换表安装时间" style="margin-bottom: 8px">
256
- </datepicker>
257
- </div>
249
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时间</label>
250
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
251
+ <datepicker
252
+ :value.sync="model.f_weekchecktime"
253
+ :format="'yyyy-MM-dd HH:mm:ss'"
254
+ v-model="model.f_weekchecktime"
255
+ :show-reset-button="reset" placeholder="替换表安装时间" style="margin-bottom: 8px">
256
+ </datepicker>
257
+ </div>
258
258
  </div>
259
259
  <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
260
260
 
261
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
262
- <div class="col-xs-8 col-sm-8 col-md-8 ">
263
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" @blur="getWeekByCard(model.f_weekcheckicsn)" >
264
- </div>
261
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
262
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
263
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" @blur="getWeekByCard(model.f_weekcheckicsn)" >
265
264
  </div>
265
+ </div>
266
266
  <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
267
267
 
268
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
269
- <div class="col-xs-8 col-sm-8 col-md-8 ">
270
- <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" >
271
- </div>
268
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
269
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
270
+ <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" >
272
271
  </div>
272
+ </div>
273
273
  <div v-if="!model.f_check_unstall && model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
274
274
 
275
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
276
- <div class="col-xs-8 col-sm-8 col-md-8 ">
277
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" >
278
- </div>
275
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
276
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
277
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" >
279
278
  </div>
279
+ </div>
280
280
  <div class="auto row bg-white col-sm-12 col-xs-12 col-md-12">
281
281
  <div class="auto col-sm-6 col-xs-6 col-md-6">
282
282
  <input class="magic-checkbox" type="checkbox" id="f_check_unstall" :true-value="'是'" :false-value="''"
@@ -285,37 +285,37 @@
285
285
  </div>
286
286
  </div>
287
287
  <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
288
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表拆卸时间</label>
289
- <div class="col-xs-8 col-sm-8 col-md-8 ">
290
- <datepicker
291
- :value.sync="model.f_weekchecktime"
292
- :format="'yyyy-MM-dd HH:mm:ss'"
293
- v-model="model.f_weekchecktime"
294
- :show-reset-button="reset" placeholder="替换表拆卸时间" style="margin-bottom: 8px">
295
- </datepicker>
296
- </div>
288
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表拆卸时间</label>
289
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
290
+ <datepicker
291
+ :value.sync="model.f_weekchecktime"
292
+ :format="'yyyy-MM-dd HH:mm:ss'"
293
+ v-model="model.f_weekchecktime"
294
+ :show-reset-button="reset" placeholder="替换表拆卸时间" style="margin-bottom: 8px">
295
+ </datepicker>
296
+ </div>
297
297
  </div>
298
298
  <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
299
299
 
300
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
301
- <div class="col-xs-8 col-sm-8 col-md-8 ">
302
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" readonly >
303
- </div>
300
+ <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
301
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
302
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" readonly >
303
+ </div>
304
304
 
305
305
  </div>
306
306
  <div v-if="model.f_check_unstall && !model.f_check_install" class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
307
307
 
308
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
309
- <div class="col-xs-8 col-sm-8 col-md-8 ">
310
- <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" readonly>
311
- </div>
308
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
309
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
310
+ <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" readonly>
311
+ </div>
312
312
  </div>
313
313
  <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
314
314
 
315
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
316
- <div class="col-xs-8 col-sm-8 col-md-8 ">
317
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" readonly>
318
- </div>
315
+ <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
316
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
317
+ <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" readonly>
318
+ </div>
319
319
  </div>
320
320
  <div v-if="model.f_check_unstall && !model.f_check_install " class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
321
321
  <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表上次读数</label>
@@ -386,426 +386,441 @@
386
386
  </div>
387
387
  </template>
388
388
  <script>
389
- import * as Util from './../Util'
390
- import Vue from 'vue'
391
- import co from 'co'
392
- import AppData from '../../stores/AppData'
393
- let getDataGen = function * (self, val) {
389
+ import * as Util from './../Util'
390
+ import Vue from 'vue'
391
+ import co from 'co'
392
+ import LoadData from '../../plugins/LoadData'
393
+ import AppData from 'readmeter-changan/src/stores/AppData'
394
+ let getDataGen = function * (self, val) {
395
+ yield self.$resetpost(Vue.handdataUrl + 'rs/sql/getUserInfo', {data:{
396
+ condition:`card_id = '${self.model.f_weekcheckicsn}'`
397
+ }}, {resolveMsg: null, rejectMsg: null})
398
+ .then((res) =>{
399
+ console.log(JSON.stringify(res.data));
400
+ if(res.data.length>0){
401
+ self.model.f_weekcheckmeternum = res.data[0].f_jb_table_code
402
+ self.model.f_weekchecksn = res.data[0].f_meternumber
403
+ }
394
404
 
395
- yield self.$resetpost(Vue.handdataUrl + 'rs/sql/getUserInfo', {data:{
396
- condition:`card_id = '${self.model.f_weekcheckicsn}'`
397
- }}, {resolveMsg: null, rejectMsg: null})
398
- .then((res) =>{
399
- console.log(JSON.stringify(res.data));
400
- if(res.data.length>0){
401
- self.model.f_weekcheckmeternum = res.data[0].f_jb_table_code
402
- self.model.f_weekchecksn = res.data[0].f_meternumber
405
+ })
406
+ }
407
+ export default {
408
+ title: '手机单户抄表',
409
+ data () {
410
+ return {
411
+ result:{params:{}},
412
+ cleanperson:[],
413
+ checkperson:[],
414
+ formperson:[],
415
+ install:[{label:'开始',value:'开始'},{label:'结束',value:'结束'}],
416
+ model: {
417
+ f_mark:'',
418
+ f_condition:'',
419
+ f_pressure:'',
420
+ f_temperature:'',
421
+ f_new_install:'',
422
+ f_result_state:'',
423
+ f_check_result_state:'',
424
+ f_check_install:'',
425
+ f_check_unstall:'',
426
+ f_wirelock:'',
427
+ imgInfo: '',
428
+ imgName: '',
429
+ sumgas_moment:0,
430
+ f_datacomparison:0,
431
+ f_weekcheckmeternum:'',
432
+ f_weekchecktime:Util.toStandardTimeString(),
433
+ f_weekcheckicsn:'',
434
+ f_weekchecksn:'',
435
+ f_weekchecknum:'',
436
+ f_weekcheckicnum:'',
437
+ f_weekcheckdishu:'',
438
+ f_insflow:0,
439
+ f_weekcheckicdishu:'',
440
+ f_oughtamount: 0,
441
+ f_new_lcd:0,
442
+ f_curbalance:0,
443
+ f_meter_repair:0,
444
+ f_card_repair:0,
445
+ f_new_tablebase:0,
446
+ f_tablesnapsgas:0,
447
+ f_icsnapsgas:0,
448
+ imgs:[]
449
+ },
450
+ showic:false,
451
+ showic1:false,
452
+ imgurl:'',
453
+ system:'',
454
+ flag: false
455
+ }
456
+ },
457
+ props: {
458
+ data: {
459
+ type: Object,
460
+ default: function () {
461
+ return {
403
462
  }
404
-
405
- })
406
- }
407
- export default {
408
- title: '手机单户抄表',
409
- data () {
410
- return {
411
- cleanperson: AppData.getParam('清滤芯人员'),
412
- checkperson: AppData.getParam('查漏人员'),
413
- formperson: AppData.getParam('单据填算人员'),
414
- install:[{label:'开始',value:'开始'},{label:'结束',value:'结束'}],
415
- model: {
416
- f_mark:'',
417
- f_condition:'',
418
- f_pressure:'',
419
- f_temperature:'',
420
- f_new_install:'',
421
- f_result_state:'',
422
- f_check_result_state:'',
423
- f_check_install:'',
424
- f_check_unstall:'',
425
- f_wirelock:'',
426
- imgInfo: '',
427
- imgName: '',
428
- sumgas_moment:0,
429
- f_datacomparison:0,
430
- f_weekcheckmeternum:'',
431
- f_weekchecktime:Util.toStandardTimeString(),
432
- f_weekcheckicsn:'',
433
- f_weekchecksn:'',
434
- f_weekchecknum:'',
435
- f_weekcheckicnum:'',
436
- f_weekcheckdishu:'',
437
- f_insflow:0,
438
- f_weekcheckicdishu:'',
439
- f_oughtamount: 0,
440
- f_new_lcd:0,
441
- f_curbalance:0,
442
- f_meter_repair:0,
443
- f_card_repair:0,
444
- f_new_tablebase:0,
445
- f_tablesnapsgas:0,
446
- f_icsnapsgas:0,
447
- imgs:[]
448
- },
449
- showic:false,
450
- showic1:false,
451
- imgurl:'',
452
- system:'',
453
- flag: false
454
463
  }
455
464
  },
456
- props: {
457
- data: {
458
- type: Object,
459
- default: function () {
460
- return {
461
- }
462
- }
463
- },
464
- showmessage:true,
465
- type: {
466
- type: String,
467
- default: 'save'
465
+ showmessage:true,
466
+ type: {
467
+ type: String,
468
+ default: 'save'
469
+ }
470
+ },
471
+ watch:{
472
+ 'model.f_result_state'(val){
473
+ if(val && val==='异常'){
474
+ this.showic1 = true
468
475
  }
469
476
  },
470
- watch:{
471
- 'model.f_result_state'(val){
472
- if(val && val==='异常'){
473
- this.showic1 = true
474
- }
475
- },
476
- 'model.f_check_result_state'(val){
477
- if(val && val==='异常'){
478
- this.showic = true
479
- }
480
- },
481
- 'model.f_check_install'(val){
482
- if(val){
483
- this.model.f_check_unstall = ''
484
- }
485
- },
486
- 'model.f_check_unstall'(val){
487
- if(val){
488
- this.model.f_check_install = ''
489
- }
490
- },
491
- 'data.f_download'(val){
492
- if(this.data.f_download){
493
- // this.$showMessage('数据更新成功,请核对数据重新计算')
494
- this.data.f_new_lcd = this.model.f_new_lcd,
495
- this.data.f_tablebase = this.model.f_new_tablebase,
496
- this.data.f_weekcheckdishu = this.model.f_weekcheckdishu,
497
- this.data.f_weekcheckicdishu = this.model.f_weekcheckicdishu
498
- }
477
+ 'model.f_check_result_state'(val){
478
+ if(val && val==='异常'){
479
+ this.showic = true
480
+ }
481
+ },
482
+ 'model.f_check_install'(val){
483
+ if(val){
484
+ this.model.f_check_unstall = ''
485
+ }
486
+ },
487
+ 'model.f_check_unstall'(val){
488
+ if(val){
489
+ this.model.f_check_install = ''
490
+ }
491
+ },
492
+ 'data.f_download'(val){
493
+ if(this.data.f_download){
494
+ // this.$showMessage('数据更新成功,请核对数据重新计算')
495
+ this.data.f_new_lcd = this.model.f_new_lcd,
496
+ this.data.f_tablebase = this.model.f_new_tablebase,
497
+ this.data.f_weekcheckdishu = this.model.f_weekcheckdishu,
498
+ this.data.f_weekcheckicdishu = this.model.f_weekcheckicdishu
499
+ }
499
500
 
500
- // this.model = Object.assign({}, this.model, this.data)
501
- this.updatedata()
501
+ // this.model = Object.assign({}, this.model, this.data)
502
+ this.updatedata()
503
+ }
504
+ },
505
+ async ready () {
506
+ Vue.resetpost(Vue.handdataUrl + 'NewSaleRest/rs/logic/getSaleInitData', {data: {f_filialeids:''}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
507
+ res.data.params.forEach((item) => {
508
+ let value = []
509
+ item.f_paramvalues.forEach((item, index) => {
510
+ value[index] = {}
511
+ value[index].label = item.name
512
+ value[index].value = item.name
513
+ })
514
+ this.result.params[item.name] = value
515
+ })
516
+ this.cleanperson = this.result.params['清理滤芯人员']
517
+ this.checkperson = this.result.params['查漏人员']
518
+ this.formperson = this.result.params['单据填算人员']
519
+ })
520
+ // Vue.handdataUrl = ''
521
+ // this.$resetpost( 'rs/sql/getUserInfo', {data:{
522
+ // condition:`card_id = '9999999014'`
523
+ // }}, {resolveMsg: null, rejectMsg: null})
524
+ // .then((res) =>{
525
+ // console.log(JSON.stringify(res.data));
526
+ // if(res.data.length>0){
527
+ // this.data = Object.assign(this.data,res.data[0])
528
+ // this.model = Object.assign(this.model,res.data[0])
529
+ // this.model.f_result_state = '异常'
530
+ // }
531
+ //
532
+ // this.flag = true
533
+ // this.updatedata()
534
+ // this.model.f_result_state = '异常'
535
+ // })
536
+
537
+ // 抄表按钮可以点击
538
+ this.flag = true
539
+ this.updatedata()
540
+ },
541
+ methods: {
542
+ checkbyic(){
543
+ this.model.f_check_result_state = Math.abs(parseInt(this.model.f_checkic)-parseInt(this.model.f_weekcheckdishu))<=this.model.f_tablewitherrorvalue?'正常':'异常'
544
+ },
545
+ checkbyic1(){
546
+ this.model.f_result_state = Math.abs(parseInt(this.model.f_checkic1)-parseInt(this.model.f_new_tablebase))<=this.model.f_tablewitherrorvalue?'正常':'异常'
547
+ },
548
+ getWeekByCard(){
549
+ let gen = getDataGen(this)
550
+ co(gen)
551
+ },
552
+ updatedata(){
553
+ this.model = Object.assign({}, this.model, this.data)
554
+ if(this.type === 'save'){
555
+ this.model.f_sumgas = this.data.f_sumgas?this.data.f_sumgas:0,
556
+ this.model.f_nogasvalue = this.data.f_nogasvalue?this.data.f_nogasvalue:0,
557
+ this.model.f_hasnotcharge = this.data.f_hasnotcharge?this.data.f_hasnotcharge:0,
558
+ this.model.f_hascharge = this.data.f_hascharge?this.data.f_hascharge:0,
559
+ this.model.f_last_lcd = this.data.f_last_lcd?this.data.f_last_lcd:0,
560
+ this.model.f_new_tablebase=this.data.f_new_tablebase?this.data.f_new_tablebase:0,
561
+ this.model.f_new_lcd= this.data.f_new_lcd?this.data.f_new_lcd:0,
562
+ this.model.f_tablesnapsgas=this.data.f_tablesnapsgas?this.data.f_tablesnapsgas:0,
563
+ this.model.f_meter_repair=this.data.f_meter_repair?this.data.f_meter_repair:0,
564
+ this.model.f_card_repair=this.data.f_card_repair?this.data.f_card_repair:0,
565
+ this.model.f_icsnapsgas=this.data.f_icsnapsgas?this.data.f_icsnapsgas:0,
566
+ this.model.f_result_state = this.data.f_result_state?this.data.f_result_state:'正常',
567
+ this.model.f_sumgas_moment = this.data.f_sumgas_moment?this.data.f_sumgas_moment:0,
568
+ this.model.f_curbalance = this.data.f_curbalance?this.data.f_curbalance:0,
569
+ this.model.f_datacomparison = this.data.f_datacomparison?this.data.f_datacomparison:0
502
570
  }
503
571
  },
504
- ready () {
505
- // Vue.handdataUrl = ''
506
- // this.$resetpost( 'rs/sql/getUserInfo', {data:{
507
- // condition:`card_id = '9999999014'`
508
- // }}, {resolveMsg: null, rejectMsg: null})
509
- // .then((res) =>{
510
- // console.log(JSON.stringify(res.data));
511
- // if(res.data.length>0){
512
- // this.data = Object.assign(this.data,res.data[0])
513
- // this.model = Object.assign(this.model,res.data[0])
514
- // this.model.f_result_state = '异常'
515
- // }
516
- //
517
- // this.flag = true
518
- // this.updatedata()
519
- // this.model.f_result_state = '异常'
520
- // })
572
+ getSumGas(){
573
+ this.$goto('hand-sell-history', {model: this.model,showmessage:this.showmessage,temp:'check-info'}, 'list')
574
+ },
575
+ //获取ic卡表数据
576
+ getMoneyMessage(){
577
+ if (this.model.f_curbalance === '' || this.model.f_curbalance === undefined) {
578
+ this.$showMessage('请检查你录入的金额')
579
+ return
580
+ }
581
+ this.model.f_new_lcd = parseInt(this.model.f_curbalance / this.model.f_price)
582
+ this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
583
+ this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
584
+ let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
585
+ this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
586
+ this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
587
+ console.log('本期已充'+this.model.f_hascharge)
588
+ this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
589
+ 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))
590
+ console.log('IC走气'+this.model.f_icsnapsgas)
591
+ this.model.f_result_state = res.f_result_state
592
+ console.log('抄表状态'+this.model.f_result_state)
593
+ this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
594
+ },
595
+ getCardMessage(){
596
+ if (this.model.f_new_lcd === '' || this.model.f_new_lcd === undefined) {
597
+ this.$showMessage('请检查你录入的液晶示数')
598
+ return
599
+ }
600
+ this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
601
+ this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
602
+ let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
603
+ this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
604
+ this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
605
+ console.log('本期已充'+this.model.f_hascharge)
606
+ this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
607
+ 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))
608
+ console.log('IC走气'+this.model.f_icsnapsgas)
609
+ this.model.f_result_state = res.f_result_state
610
+ console.log('抄表状态'+this.model.f_result_state)
611
+ this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
612
+ this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
613
+ console.log('剩余金额'+this.model.f_curbalance)
521
614
 
522
- // 抄表按钮可以点击
523
- this.flag = true
524
- this.updatedata()
525
615
  },
526
- methods: {
527
- checkbyic(){
528
- this.model.f_check_result_state = Math.abs(parseInt(this.model.f_checkic)-parseInt(this.model.f_weekcheckdishu))<=this.model.f_tablewitherrorvalue?'正常':'异常'
529
- },
530
- checkbyic1(){
531
- this.model.f_result_state = Math.abs(parseInt(this.model.f_checkic1)-parseInt(this.model.f_new_tablebase))<=this.model.f_tablewitherrorvalue?'正常':'异常'
532
- },
533
- getWeekByCard(){
534
- let gen = getDataGen(this)
535
- co(gen)
536
- },
537
- updatedata(){
538
- this.model = Object.assign({}, this.model, this.data)
539
- if(this.type === 'save'){
540
- this.model.f_sumgas = this.data.f_sumgas?this.data.f_sumgas:0,
541
- this.model.f_nogasvalue = this.data.f_nogasvalue?this.data.f_nogasvalue:0,
542
- this.model.f_hasnotcharge = this.data.f_hasnotcharge?this.data.f_hasnotcharge:0,
543
- this.model.f_hascharge = this.data.f_hascharge?this.data.f_hascharge:0,
544
- this.model.f_last_lcd = this.data.f_last_lcd?this.data.f_last_lcd:0,
545
- this.model.f_new_tablebase=this.data.f_new_tablebase?this.data.f_new_tablebase:0,
546
- this.model.f_new_lcd= this.data.f_new_lcd?this.data.f_new_lcd:0,
547
- this.model.f_tablesnapsgas=this.data.f_tablesnapsgas?this.data.f_tablesnapsgas:0,
548
- this.model.f_meter_repair=this.data.f_meter_repair?this.data.f_meter_repair:0,
549
- this.model.f_card_repair=this.data.f_card_repair?this.data.f_card_repair:0,
550
- this.model.f_icsnapsgas=this.data.f_icsnapsgas?this.data.f_icsnapsgas:0,
551
- this.model.f_result_state = this.data.f_result_state?this.data.f_result_state:'正常',
552
- this.model.f_sumgas_moment = this.data.f_sumgas_moment?this.data.f_sumgas_moment:0,
553
- this.model.f_curbalance = this.data.f_curbalance?this.data.f_curbalance:0,
554
- this.model.f_datacomparison = this.data.f_datacomparison?this.data.f_datacomparison:0
555
- }
556
- },
557
- getSumGas(){
558
- this.$goto('hand-sell-history', {model: this.model,showmessage:this.showmessage,temp:'check-info'}, 'list')
559
- },
560
- //获取ic卡表数据
561
- getMoneyMessage(){
562
- if (this.model.f_curbalance === '' || this.model.f_curbalance === undefined) {
563
- this.$showMessage('请检查你录入的金额')
564
- return
565
- }
566
- this.model.f_new_lcd = parseInt(this.model.f_curbalance / this.model.f_price)
567
- this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
568
- this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
569
- let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
570
- this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
571
- this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
572
- console.log('本期已充'+this.model.f_hascharge)
573
- this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
574
- 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))
575
- console.log('IC走气'+this.model.f_icsnapsgas)
576
- this.model.f_result_state = res.f_result_state
577
- console.log('抄表状态'+this.model.f_result_state)
578
- this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
579
- },
580
- getCardMessage(){
581
- if (this.model.f_new_lcd === '' || this.model.f_new_lcd === undefined) {
582
- this.$showMessage('请检查你录入的液晶示数')
583
- return
584
- }
585
- this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
586
- this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
587
- let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
588
- this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
589
- this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
590
- console.log('本期已充'+this.model.f_hascharge)
591
- this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
592
- 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))
593
- console.log('IC走气'+this.model.f_icsnapsgas)
594
- this.model.f_result_state = res.f_result_state
595
- console.log('抄表状态'+this.model.f_result_state)
596
- this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
597
- this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
598
- console.log('剩余金额'+this.model.f_curbalance)
599
616
 
600
- },
617
+ getWeekCardMessage(){
618
+ // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckicdishu){
619
+ // this.model.f_new_lcd = this.model.f_weekcheckicdishu
620
+ // }
621
+ if (this.model.f_weekcheckicdishu === '' || this.model.f_weekcheckicdishu === undefined) {
622
+ this.$showMessage('请检查你录入的液晶示数')
623
+ return
624
+ }
601
625
 
602
- getWeekCardMessage(){
603
- // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckicdishu){
604
- // this.model.f_new_lcd = this.model.f_weekcheckicdishu
605
- // }
606
- if (this.model.f_weekcheckicdishu === '' || this.model.f_weekcheckicdishu === undefined) {
607
- this.$showMessage('请检查你录入的液晶示数')
608
- return
609
- }
626
+ let postdata = Object.assign({},this.model)
627
+ postdata.week = '1',
610
628
 
611
- let postdata = Object.assign({},this.model)
612
- postdata.week = '1',
629
+ this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
630
+ this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
631
+ let res = this.$androidUtil.bzLogic('gasComputation', postdata,{rejectMsg: null, resolve: null})
632
+ this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
633
+ this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
634
+ console.log('本期已充'+this.model.f_hascharge)
635
+ this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
636
+ this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)+ parseInt(this.model.f_hascharge)+parseInt(this.model.f_card_repair)- parseInt(this.model.f_weekcheckicdishu))
637
+ console.log('IC走气'+this.model.f_icsnapsgas)
638
+ this.model.f_check_result_state = res.f_result_state
639
+ console.log('抄表状态'+this.model.f_result_state)
640
+ this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
641
+ this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
642
+ console.log('剩余金额'+this.model.f_curbalance)
643
+ },
644
+ //获取基表走气量
645
+ getMeterMessage(){
646
+ // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
647
+ // this.model.f_weekcheckdishu = this.model.f_new_tablebase
648
+ // }
649
+ if (this.model.f_new_tablebase === '' || this.model.f_new_tablebase === undefined) {
650
+ this.$showMessage('请检查你录入的表底数')
651
+ return
652
+ }
653
+ if (parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase) < 0) {
654
+ this.$showMessage('录入本期表底数不能小于上期表底数！')
655
+ return
656
+ }
657
+ this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
658
+ this.model.f_last_tablebase= this.model.f_last_tablebase?this.model.f_last_tablebase:0
659
+ // this.$set(this.model.f_tablesnapsgas,'')
660
+ this.model.f_tablesnapsgas = parseInt(this.model.f_new_tablebase)- parseInt(this.model.f_last_tablebase)-parseInt(this.model.f_meter_repair)
661
+ if (this.model.f_new_lcd ) {
662
+ this.getCardMessage()
663
+ }
664
+ },
613
665
 
614
- this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
615
- this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
616
- let res = this.$androidUtil.bzLogic('gasComputation', postdata,{rejectMsg: null, resolve: null})
617
- this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
618
- this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
619
- console.log('本期已充'+this.model.f_hascharge)
620
- this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
621
- this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)+ parseInt(this.model.f_hascharge)+parseInt(this.model.f_card_repair)- parseInt(this.model.f_weekcheckicdishu))
622
- console.log('IC走气'+this.model.f_icsnapsgas)
623
- this.model.f_check_result_state = res.f_result_state
624
- console.log('抄表状态'+this.model.f_result_state)
625
- this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
626
- this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
627
- console.log('剩余金额'+this.model.f_curbalance)
628
- },
629
- //获取基表走气量
630
- getMeterMessage(){
631
- // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
632
- // this.model.f_weekcheckdishu = this.model.f_new_tablebase
633
- // }
634
- if (this.model.f_new_tablebase === '' || this.model.f_new_tablebase === undefined) {
635
- this.$showMessage('请检查你录入的表底数')
636
- return
637
- }
638
- if (parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase) < 0) {
639
- this.$showMessage('录入本期表底数不能小于上期表底数！')
640
- return
641
- }
642
- this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
643
- this.model.f_last_tablebase= this.model.f_last_tablebase?this.model.f_last_tablebase:0
644
- // this.$set(this.model.f_tablesnapsgas,'')
645
- this.model.f_tablesnapsgas = parseInt(this.model.f_new_tablebase)- parseInt(this.model.f_last_tablebase)-parseInt(this.model.f_meter_repair)
646
- if (this.model.f_new_lcd ) {
647
- this.getCardMessage()
648
- }
649
- },
666
+ //获取基表走气量
667
+ getWeekMeterMessage(){
668
+ // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
669
+ // this.model.f_weekcheckdishu = this.model.f_new_tablebase
670
+ // }
671
+ if (this.model.f_weekcheckdishu === '' || this.model.f_weekcheckdishu === undefined) {
672
+ this.$showMessage('请检查你录入的表底数')
673
+ return
674
+ }
675
+ if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
676
+ this.$showMessage('录入本期表底数不能小于上期表底数！')
677
+ return
678
+ }
679
+ this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
680
+ this.model.f_weekchecknum= this.model.f_weekchecknum?this.model.f_weekchecknum:0
681
+ // this.$set(this.model.f_tablesnapsgas,'')
682
+ this.model.f_weektablesnapsgas = parseInt(this.model.f_weekcheckdishu)- parseInt(this.model.f_weekchecknum)-parseInt(this.model.f_meter_repair)
683
+ if (this.model.f_weekcheckicdishu ) {
684
+ this.getWeekCardMessage()
685
+ }
686
+ },
650
687
 
651
- //获取基表走气量
652
- getWeekMeterMessage(){
653
- // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
654
- // this.model.f_weekcheckdishu = this.model.f_new_tablebase
655
- // }
656
- if (this.model.f_weekcheckdishu === '' || this.model.f_weekcheckdishu === undefined) {
657
- this.$showMessage('请检查你录入的表底数')
658
- return
659
- }
688
+ commit () {
689
+ if ((parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase) < 0) && this.model.f_if_change!=='是') {
690
+ this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
691
+ return
692
+ }
693
+ if(this.model.f_check_install){
694
+ this.model.f_weekcheck = 1
695
+ }
696
+ if(this.model.f_check_unstall){
697
+ this.model.f_weekcheck = 0
698
+ }
699
+ if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
660
700
  if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
661
701
  this.$showMessage('录入本期表底数不能小于上期表底数！')
662
702
  return
663
703
  }
664
- this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
665
- this.model.f_weekchecknum= this.model.f_weekchecknum?this.model.f_weekchecknum:0
666
- // this.$set(this.model.f_tablesnapsgas,'')
667
- this.model.f_weektablesnapsgas = parseInt(this.model.f_weekcheckdishu)- parseInt(this.model.f_weekchecknum)-parseInt(this.model.f_meter_repair)
668
- if (this.model.f_weekcheckicdishu ) {
669
- this.getWeekCardMessage()
670
- }
671
- },
672
-
673
- commit () {
674
- if ((parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase) < 0) && this.model.f_if_change!=='是') {
675
- this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
676
- return
677
- }
678
- if(this.model.f_check_install){
679
- this.model.f_weekcheck = 1
680
- }
681
- if(this.model.f_check_unstall){
682
- this.model.f_weekcheck = 0
683
- }
684
- if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
685
- if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
686
- this.$showMessage('录入本期表底数不能小于上期表底数！')
687
- return
688
- }
689
- // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
690
- // this.$showMessage('录入本期表底数不能小于上期表底数！')
691
- // return
692
- // }
693
- }
694
- // if (!(this.model.imgName && this.model.imgName.length > 0)) {
695
- // this.$showMessage('请录入抄表照片！')
704
+ // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
705
+ // this.$showMessage('录入本期表底数不能小于上期表底数！')
696
706
  // return
697
707
  // }
698
- if (!this.flag) {
699
- this.$showMessage(`系统正在进行抄表，请勿重复操作！`)
700
- // this.$showAlert('系统正在进行抄表，请勿重复操作！', 'warning', 2000)
701
- return
702
- }
703
- if(this.model.lastImgName){
704
- this.model.lastImgName = `.${this.model.f_user_name}${this.model.imgName.substring(this.model.imgName.indexOf('.'))}`
705
- }
706
- // 设置抄表按钮不可用
708
+ }
709
+ // if (!(this.model.imgName && this.model.imgName.length > 0)) {
710
+ // this.$showMessage('请录入抄表照片！')
711
+ // return
712
+ // }
713
+ if (!this.flag) {
714
+ this.$showMessage(`系统正在进行抄表，请勿重复操作！`)
715
+ // this.$showAlert('系统正在进行抄表，请勿重复操作！', 'warning', 2000)
716
+ return
717
+ }
718
+ if(this.model.lastImgName){
719
+ this.model.lastImgName = `.${this.model.f_user_name}${this.model.imgName.substring(this.model.imgName.indexOf('.'))}`
720
+ }
721
+ // 设置抄表按钮不可用
722
+ this.flag = false
723
+ // 将用户编号放入抄表照片名中
724
+ console.log(this.model.lastImgName)
725
+ this.model.f_oughtamount = parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase)
726
+ // this.model.f_last_hand_date = Util.getBeforeMonth(this.model.f_hand_date)
727
+ // this.model.f_last_hand_date =
728
+ this.model.f_new_tablebase = parseInt(this.model.f_new_tablebase)
729
+ this.model.f_new_lcd = parseInt(this.model.f_new_lcd)
730
+ this.model.f_end_time = this.data.f_end_time
731
+ let res = this.$androidUtil.bzLogic('phone-readmeter', this.model, {rejectMsg: null, resolve: null})
732
+ console.log(res)
733
+ if (res.code === 200) {
734
+ console.log('抄表完成！')
735
+ // 抄表完成设置按钮可用
707
736
  this.flag = false
708
- // 将用户编号放入抄表照片名中
709
- console.log(this.model.lastImgName)
710
- this.model.f_oughtamount = parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase)
711
- // this.model.f_last_hand_date = Util.getBeforeMonth(this.model.f_hand_date)
712
- // this.model.f_last_hand_date =
713
- this.model.f_new_tablebase = parseInt(this.model.f_new_tablebase)
714
- this.model.f_new_lcd = parseInt(this.model.f_new_lcd)
715
- this.model.f_end_time = this.data.f_end_time
716
- let res = this.$androidUtil.bzLogic('phone-readmeter', this.model, {rejectMsg: null, resolve: null})
717
- console.log(res)
718
- if (res.code === 200) {
719
- console.log('抄表完成！')
720
- // 抄表完成设置按钮可用
721
- this.flag = false
722
- this.$showMessage('抄表成功！')
723
- // this.$showAlert('抄表成功！', 'success', 2000)
724
- // 发送抄表成功事件给父页面
725
- // this.$dispatch('hand-success', this.type)
726
- }else{
727
- console.log('抄表失败')
728
- // 抄表完成设置按钮可用
729
- this.flag = true
730
- // this.$showMessage(`${res.backData.msg}！请前往表单上传重新提交`)
731
- // this.$showAlert(`${res.backData.msg}！请前往表单上传重新提交`, 'danger', 2000)
732
- }
733
- },
734
- //将数据存入本地数据库，下次进入页面回写数据
735
- save(){
736
- if (!this.flag) {
737
- this.$showMessage(`该抄表单已上传成功,请勿重复保存！`)
738
- return
739
- }
737
+ this.$showMessage('抄表成功！')
738
+ // this.$showAlert('抄表成功！', 'success', 2000)
739
+ // 发送抄表成功事件给父页面
740
+ // this.$dispatch('hand-success', this.type)
741
+ }else{
742
+ console.log('抄表失败')
743
+ // 抄表完成设置按钮可用
744
+ this.flag = true
745
+ // this.$showMessage(`${res.backData.msg}！请前往表单上传重新提交`)
746
+ // this.$showAlert(`${res.backData.msg}！请前往表单上传重新提交`, 'danger', 2000)
747
+ }
748
+ },
749
+ //将数据存入本地数据库，下次进入页面回写数据
750
+ save(){
751
+ if (!this.flag) {
752
+ this.$showMessage(`该抄表单已上传成功,请勿重复保存！`)
753
+ return
754
+ }
740
755
 
741
- if ((parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase)) < 0 && this.model.f_if_change!=='是') {
742
- this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
756
+ if ((parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase)) < 0 && this.model.f_if_change!=='是') {
757
+ this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
758
+ return
759
+ }
760
+ // window.alert(this.f_check_install)
761
+ if(this.model.f_check_install){
762
+ this.model.f_weekcheck = 1
763
+ }
764
+ if(this.model.f_check_unstall){
765
+ this.model.f_weekcheck = 0
766
+ }
767
+ if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
768
+ if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
769
+ this.$showMessage('录入本期表底数不能小于上期表底数！')
743
770
  return
744
771
  }
745
- // window.alert(this.f_check_install)
746
- if(this.model.f_check_install){
747
- this.model.f_weekcheck = 1
748
- }
749
- if(this.model.f_check_unstall){
750
- this.model.f_weekcheck = 0
751
- }
752
- if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
753
- if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
754
- this.$showMessage('录入本期表底数不能小于上期表底数！')
755
- return
756
- }
757
- // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
758
- // this.$showMessage('录入本期表底数不能小于上期表底数！')
759
- // return
760
- // }
761
- }
762
- this.model.f_end_time = this.data.f_end_time
763
- this.model.f_new_tablebase = parseInt(this.model.f_new_tablebase)
764
- this.model.f_new_lcd = parseInt(this.model.f_new_lcd)
765
- let res = this.$androidUtil.bzLogic('local-save',this.model,{rejectMsg: null, resolve: null})
766
- if(res.status === 200){
767
- // this.flag = false
768
- this.$showMessage('本地数据保存成功！')
769
- // this.$showAlert('本地数据保存成功!', 'success', 2000)
770
- }
772
+ // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
773
+ // this.$showMessage('录入本期表底数不能小于上期表底数！')
774
+ // return
775
+ // }
776
+ }
777
+ this.model.f_end_time = this.data.f_end_time
778
+ this.model.f_new_tablebase = parseInt(this.model.f_new_tablebase)
779
+ this.model.f_new_lcd = parseInt(this.model.f_new_lcd)
780
+ let res = this.$androidUtil.bzLogic('local-save',this.model,{rejectMsg: null, resolve: null})
781
+ if(res.status === 200){
782
+ // this.flag = false
783
+ this.$showMessage('本地数据保存成功！')
784
+ // this.$showAlert('本地数据保存成功!', 'success', 2000)
771
785
  }
772
786
  }
773
787
  }
788
+ }
774
789
  </script>
775
790
  <style scoped>
776
- .mt-5 {
777
- margin-top: 5px;
778
- }
779
- .mt-10 {
780
- margin-top: 10px;
781
- }
782
- .mt-20 {
783
- margin-top: 20px;
784
- }
785
- .app-row-none-border {
786
- background-color: white;
787
- padding: 10px 10px 0 10px;
788
- }
789
- .font{
790
- font: 17px PingFang-SC-Medium;
791
- color: #666666
792
- }
793
- .show-font{
794
- font: 17px PingFang-SC-Medium;
795
- color: #333333
796
- }
797
- .btn-font{
798
- font:600 16px PingFang-SC-Bold;
799
- color: #499EDF;
800
- }
801
- .head{
802
- font-size: 1.25em;
803
- font-weight: bolder;
804
- padding: 0.5em;
805
- }
806
- .btn-color{
807
- background-color: #FFFFFF;
808
- border-radius: 10px ;
809
- border: 1px solid #499EDF;
810
- }
791
+ .mt-5 {
792
+ margin-top: 5px;
793
+ }
794
+ .mt-10 {
795
+ margin-top: 10px;
796
+ }
797
+ .mt-20 {
798
+ margin-top: 20px;
799
+ }
800
+ .app-row-none-border {
801
+ background-color: white;
802
+ padding: 10px 10px 0 10px;
803
+ }
804
+ .font{
805
+ font: 17px PingFang-SC-Medium;
806
+ color: #666666
807
+ }
808
+ .show-font{
809
+ font: 17px PingFang-SC-Medium;
810
+ color: #333333
811
+ }
812
+ .btn-font{
813
+ font:600 16px PingFang-SC-Bold;
814
+ color: #499EDF;
815
+ }
816
+ .head{
817
+ font-size: 1.25em;
818
+ font-weight: bolder;
819
+ padding: 0.5em;
820
+ }
821
+ .btn-color{
822
+ background-color: #FFFFFF;
823
+ border-radius: 10px ;
824
+ border: 1px solid #499EDF;
825
+ }
811
826
  </style>