readmeter-changan 1.0.36 → 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 +545 -480
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.36",
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 ">
@@ -143,6 +143,12 @@
143
143
  <input type="number" id="f_condition" class="form-control font "v-el:f_condition v-model="model.f_condition" v-next-el="f_remark">
144
144
  </div>
145
145
  </div>
146
+ <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
147
+ <label for="f_condition" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">计量表钢丝锁</label>
148
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
149
+ <input type="text" id="f_wirelock" class="form-control font "v-el:f_wirelock v-model="model.f_wirelock" v-next-el="f_remark">
150
+ </div>
151
+ </div>
146
152
  <div class="auto col-xs-12 col-sm-12 col-md-12 bg-white " style="padding: 0.5em" >
147
153
 
148
154
  <p class="panel-title col-xs-4 col-sm-2 col-md-2 text-left font">换表</p>
@@ -173,6 +179,45 @@
173
179
  </v-select>
174
180
  </div>
175
181
  </div>
182
+ <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
183
+ <label for="f_condition" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">清理滤芯人员</label>
184
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
185
+ <v-select id="f_clean_person"
186
+ v-model="model.f_clean_person"
187
+ placeholder='请选择'
188
+ :value.sync="model.f_clean_person"
189
+ multiple
190
+ :options='cleanperson'
191
+ close-on-select >
192
+ </v-select>
193
+ </div>
194
+ </div>
195
+ <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
196
+ <label for="f_condition" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">查漏人员</label>
197
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
198
+ <v-select id="f_check_person"
199
+ v-model="model.f_check_person"
200
+ placeholder='请选择'
201
+ :value.sync="model.f_check_person"
202
+ multiple
203
+ :options='checkperson'
204
+ close-on-select >
205
+ </v-select>
206
+ </div>
207
+ </div>
208
+ <div class="auto col-xs-12 col-sm-6 col-md-6 bg-white app-row ">
209
+ <label for="f_condition" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">单据填算人员</label>
210
+ <div class="col-xs-8 col-sm-8 col-md-8 ">
211
+ <v-select id="f_clean_person"
212
+ v-model="model.f_form_person"
213
+ placeholder='请选择'
214
+ :value.sync="model.f_form_person"
215
+ multiple
216
+ :options='formperson'
217
+ close-on-select >
218
+ </v-select>
219
+ </div>
220
+ </div>
176
221
  <div class="auto row col-sm-12 col-xs-12 col-md-12 bg-white">
177
222
  <div class="auto col-sm-6 col-xs-6 col-md-6">
178
223
  <input class="magic-checkbox" type="checkbox" id="f_check_install" :true-value="'是'" :false-value="''"
@@ -186,12 +231,12 @@
186
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">
187
232
  </div>
188
233
  </div>
189
- <!-- <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 ">-->
190
- <!-- <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表IC卡累计底数</label>-->
191
- <!-- <div class="col-xs-8 col-sm-8 col-md-8 ">-->
192
- <!-- <input type="number" id="f_weekcheckcardnum" class="form-control font " v-el:f_weekchecknum v-model="model.f_weekcheckcardnum" v-next-el="f_weekcheckicnum">-->
193
- <!-- </div>-->
194
- <!-- </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>-->
195
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 ">
196
241
  <label for="f_weekcheckicnum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时剩余气量</label>
197
242
  <div class="col-xs-8 col-sm-8 col-md-8 ">
@@ -201,37 +246,37 @@
201
246
  </div>
202
247
 
203
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 ">
204
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表安装时间</label>
205
- <div class="col-xs-8 col-sm-8 col-md-8 ">
206
- <datepicker
207
- :value.sync="model.f_weekchecktime"
208
- :format="'yyyy-MM-dd HH:mm:ss'"
209
- v-model="model.f_weekchecktime"
210
- :show-reset-button="reset" placeholder="替换表安装时间" style="margin-bottom: 8px">
211
- </datepicker>
212
- </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>
213
258
  </div>
214
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 ">
215
260
 
216
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
217
- <div class="col-xs-8 col-sm-8 col-md-8 ">
218
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" @blur="getWeekByCard(model.f_weekcheckicsn)" >
219
- </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)" >
220
264
  </div>
265
+ </div>
221
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 ">
222
267
 
223
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
224
- <div class="col-xs-8 col-sm-8 col-md-8 ">
225
- <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" >
226
- </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" >
227
271
  </div>
272
+ </div>
228
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 ">
229
274
 
230
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
231
- <div class="col-xs-8 col-sm-8 col-md-8 ">
232
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" >
233
- </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" >
234
278
  </div>
279
+ </div>
235
280
  <div class="auto row bg-white col-sm-12 col-xs-12 col-md-12">
236
281
  <div class="auto col-sm-6 col-xs-6 col-md-6">
237
282
  <input class="magic-checkbox" type="checkbox" id="f_check_unstall" :true-value="'是'" :false-value="''"
@@ -240,37 +285,37 @@
240
285
  </div>
241
286
  </div>
242
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 ">
243
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表拆卸时间</label>
244
- <div class="col-xs-8 col-sm-8 col-md-8 ">
245
- <datepicker
246
- :value.sync="model.f_weekchecktime"
247
- :format="'yyyy-MM-dd HH:mm:ss'"
248
- v-model="model.f_weekchecktime"
249
- :show-reset-button="reset" placeholder="替换表拆卸时间" style="margin-bottom: 8px">
250
- </datepicker>
251
- </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>
252
297
  </div>
253
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 ">
254
299
 
255
- <label for="f_weekcheckicsn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表卡号</label>
256
- <div class="col-xs-8 col-sm-8 col-md-8 ">
257
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekcheckicsn v-model="model.f_weekcheckicsn" readonly >
258
- </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>
259
304
 
260
305
  </div>
261
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 ">
262
307
 
263
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表基表表号</label>
264
- <div class="col-xs-8 col-sm-8 col-md-8 ">
265
- <input type="text" id="f_weekcheckmeternum" class="form-control font" v-el:f_weekcheckmeternum v-model="model.f_weekcheckmeternum" readonly>
266
- </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>
267
312
  </div>
268
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 ">
269
314
 
270
- <label for="f_weekchecksn" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表表号</label>
271
- <div class="col-xs-8 col-sm-8 col-md-8 ">
272
- <input type="text" id="f_weekchecksn" class="form-control font" v-el:f_weekchecksn v-model="model.f_weekchecksn" readonly>
273
- </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>
274
319
  </div>
275
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 ">
276
321
  <label for="f_weekchecknum" class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">替换表上次读数</label>
@@ -341,421 +386,441 @@
341
386
  </div>
342
387
  </template>
343
388
  <script>
344
- import * as Util from './../Util'
345
- import Vue from 'vue'
346
- import co from 'co'
347
- 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
+ }
348
404
 
349
- yield self.$resetpost(Vue.handdataUrl + 'rs/sql/getUserInfo', {data:{
350
- condition:`card_id = '${self.model.f_weekcheckicsn}'`
351
- }}, {resolveMsg: null, rejectMsg: null})
352
- .then((res) =>{
353
- console.log(JSON.stringify(res.data));
354
- if(res.data.length>0){
355
- self.model.f_weekcheckmeternum = res.data[0].f_jb_table_code
356
- 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 {
357
462
  }
358
-
359
- })
360
- }
361
- export default {
362
- title: '手机单户抄表',
363
- data () {
364
- return {
365
- install:[{label:'开始',value:'开始'},{label:'结束',value:'结束'}],
366
- model: {
367
- f_mark:'',
368
- f_condition:'',
369
- f_pressure:'',
370
- f_temperature:'',
371
- f_new_install:'',
372
- f_result_state:'',
373
- f_check_result_state:'',
374
- f_check_install:'',
375
- f_check_unstall:'',
376
- imgInfo: '',
377
- imgName: '',
378
- sumgas_moment:0,
379
- f_datacomparison:0,
380
- f_weekcheckmeternum:'',
381
- f_weekchecktime:'',
382
- f_weekcheckicsn:'',
383
- f_weekchecksn:'',
384
- f_weekchecknum:'',
385
- f_weekcheckicnum:'',
386
- f_weekcheckdishu:'',
387
- f_insflow:0,
388
- f_weekcheckicdishu:'',
389
- f_oughtamount: 0,
390
- f_new_lcd:0,
391
- f_curbalance:0,
392
- f_meter_repair:0,
393
- f_card_repair:0,
394
- f_new_tablebase:0,
395
- f_tablesnapsgas:0,
396
- f_icsnapsgas:0,
397
- imgs:[]
398
- },
399
- showic:false,
400
- showic1:false,
401
- imgurl:'',
402
- system:'',
403
- flag: false
404
463
  }
405
464
  },
406
- props: {
407
- data: {
408
- type: Object,
409
- default: function () {
410
- return {
411
- }
412
- }
413
- },
414
- showmessage:true,
415
- type: {
416
- type: String,
417
- 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
418
475
  }
419
476
  },
420
- watch:{
421
- 'model.f_result_state'(val){
422
- if(val && val==='异常'){
423
- this.showic1 = true
424
- }
425
- },
426
- 'model.f_check_result_state'(val){
427
- if(val && val==='异常'){
428
- this.showic = true
429
- }
430
- },
431
- 'model.f_check_install'(val){
432
- if(val){
433
- this.model.f_check_unstall = ''
434
- }
435
- },
436
- 'model.f_check_unstall'(val){
437
- if(val){
438
- this.model.f_check_install = ''
439
- }
440
- },
441
- 'data.f_download'(val){
442
- if(this.data.f_download){
443
- // this.$showMessage('数据更新成功,请核对数据重新计算')
444
- this.data.f_new_lcd = this.model.f_new_lcd,
445
- this.data.f_tablebase = this.model.f_new_tablebase,
446
- this.data.f_weekcheckdishu = this.model.f_weekcheckdishu,
447
- this.data.f_weekcheckicdishu = this.model.f_weekcheckicdishu
448
- }
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
+ }
500
+
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
+ // })
449
536
 
450
- // this.model = Object.assign({}, this.model, this.data)
451
- this.updatedata()
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
570
+ }
571
+ },
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
452
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))
453
594
  },
454
- ready () {
455
- // Vue.handdataUrl = ''
456
- // this.$resetpost( 'rs/sql/getUserInfo', {data:{
457
- // condition:`card_id = '9999999014'`
458
- // }}, {resolveMsg: null, rejectMsg: null})
459
- // .then((res) =>{
460
- // console.log(JSON.stringify(res.data));
461
- // if(res.data.length>0){
462
- // this.data = Object.assign(this.data,res.data[0])
463
- // this.model = Object.assign(this.model,res.data[0])
464
- // this.model.f_result_state = '异常'
465
- // }
466
- //
467
- // this.flag = true
468
- // this.updatedata()
469
- // this.model.f_result_state = '异常'
470
- // })
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)
471
614
 
472
- // 抄表按钮可以点击
473
- this.flag = true
474
- this.updatedata()
475
615
  },
476
- methods: {
477
- checkbyic(){
478
- this.model.f_check_result_state = Math.abs(parseInt(this.model.f_checkic)-parseInt(this.model.f_weekcheckdishu))<=this.model.f_tablewitherrorvalue?'正常':'异常'
479
- },
480
- checkbyic1(){
481
- this.model.f_result_state = Math.abs(parseInt(this.model.f_checkic1)-parseInt(this.model.f_new_tablebase))<=this.model.f_tablewitherrorvalue?'正常':'异常'
482
- },
483
- getWeekByCard(){
484
- let gen = getDataGen(this)
485
- co(gen)
486
- },
487
- updatedata(){
488
- this.model = Object.assign({}, this.model, this.data)
489
- if(this.type === 'save'){
490
- this.model.f_sumgas = this.data.f_sumgas?this.data.f_sumgas:0,
491
- this.model.f_nogasvalue = this.data.f_nogasvalue?this.data.f_nogasvalue:0,
492
- this.model.f_hasnotcharge = this.data.f_hasnotcharge?this.data.f_hasnotcharge:0,
493
- this.model.f_hascharge = this.data.f_hascharge?this.data.f_hascharge:0,
494
- this.model.f_last_lcd = this.data.f_last_lcd?this.data.f_last_lcd:0,
495
- this.model.f_new_tablebase=this.data.f_new_tablebase?this.data.f_new_tablebase:0,
496
- this.model.f_new_lcd= this.data.f_new_lcd?this.data.f_new_lcd:0,
497
- this.model.f_tablesnapsgas=this.data.f_tablesnapsgas?this.data.f_tablesnapsgas:0,
498
- this.model.f_meter_repair=this.data.f_meter_repair?this.data.f_meter_repair:0,
499
- this.model.f_card_repair=this.data.f_card_repair?this.data.f_card_repair:0,
500
- this.model.f_icsnapsgas=this.data.f_icsnapsgas?this.data.f_icsnapsgas:0,
501
- this.model.f_result_state = this.data.f_result_state?this.data.f_result_state:'正常',
502
- this.model.f_sumgas_moment = this.data.f_sumgas_moment?this.data.f_sumgas_moment:0,
503
- this.model.f_curbalance = this.data.f_curbalance?this.data.f_curbalance:0,
504
- this.model.f_datacomparison = this.data.f_datacomparison?this.data.f_datacomparison:0
505
- }
506
- },
507
- getSumGas(){
508
- this.$goto('hand-sell-history', {model: this.model,showmessage:this.showmessage,temp:'check-info'}, 'list')
509
- },
510
- //获取ic卡表数据
511
- getMoneyMessage(){
512
- if (this.model.f_curbalance === '' || this.model.f_curbalance === undefined) {
513
- this.$showMessage('请检查你录入的金额')
514
- return
515
- }
516
- this.model.f_new_lcd = parseInt(this.model.f_curbalance / this.model.f_price)
517
- this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
518
- this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
519
- let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
520
- this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
521
- this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
522
- console.log('本期已充'+this.model.f_hascharge)
523
- this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
524
- 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))
525
- console.log('IC走气'+this.model.f_icsnapsgas)
526
- this.model.f_result_state = res.f_result_state
527
- console.log('抄表状态'+this.model.f_result_state)
528
- this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
529
- },
530
- getCardMessage(){
531
- if (this.model.f_new_lcd === '' || this.model.f_new_lcd === undefined) {
532
- this.$showMessage('请检查你录入的液晶示数')
533
- return
534
- }
535
- this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
536
- this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
537
- let res = this.$androidUtil.bzLogic('gasComputation', this.model,{rejectMsg: null, resolve: null})
538
- this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
539
- this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
540
- console.log('本期已充'+this.model.f_hascharge)
541
- this.model.f_last_lcd= this.model.f_last_lcd?this.model.f_last_lcd:0
542
- 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))
543
- console.log('IC走气'+this.model.f_icsnapsgas)
544
- this.model.f_result_state = res.f_result_state
545
- console.log('抄表状态'+this.model.f_result_state)
546
- this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
547
- this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
548
- console.log('剩余金额'+this.model.f_curbalance)
549
616
 
550
- },
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
+ }
551
625
 
552
- getWeekCardMessage(){
553
- // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckicdishu){
554
- // this.model.f_new_lcd = this.model.f_weekcheckicdishu
555
- // }
556
- if (this.model.f_weekcheckicdishu === '' || this.model.f_weekcheckicdishu === undefined) {
557
- this.$showMessage('请检查你录入的液晶示数')
558
- return
559
- }
626
+ let postdata = Object.assign({},this.model)
627
+ postdata.week = '1',
560
628
 
561
- let postdata = Object.assign({},this.model)
562
- 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
+ },
563
665
 
564
- this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
565
- this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
566
- let res = this.$androidUtil.bzLogic('gasComputation', postdata,{rejectMsg: null, resolve: null})
567
- this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
568
- this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
569
- console.log('本期已充'+this.model.f_hascharge)
570
- this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
571
- 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))
572
- console.log('IC走气'+this.model.f_icsnapsgas)
573
- this.model.f_check_result_state = res.f_result_state
574
- console.log('抄表状态'+this.model.f_result_state)
575
- this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
576
- this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
577
- console.log('剩余金额'+this.model.f_curbalance)
578
- },
579
- //获取基表走气量
580
- getMeterMessage(){
581
- // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
582
- // this.model.f_weekcheckdishu = this.model.f_new_tablebase
583
- // }
584
- if (this.model.f_new_tablebase === '' || this.model.f_new_tablebase === undefined) {
585
- this.$showMessage('请检查你录入的表底数')
586
- return
587
- }
588
- if (parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase) < 0) {
589
- this.$showMessage('录入本期表底数不能小于上期表底数！')
590
- return
591
- }
592
- this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
593
- this.model.f_last_tablebase= this.model.f_last_tablebase?this.model.f_last_tablebase:0
594
- // this.$set(this.model.f_tablesnapsgas,'')
595
- this.model.f_tablesnapsgas = parseInt(this.model.f_new_tablebase)- parseInt(this.model.f_last_tablebase)-parseInt(this.model.f_meter_repair)
596
- if (this.model.f_new_lcd ) {
597
- this.getCardMessage()
598
- }
599
- },
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
+ },
600
687
 
601
- //获取基表走气量
602
- getWeekMeterMessage(){
603
- // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
604
- // this.model.f_weekcheckdishu = this.model.f_new_tablebase
605
- // }
606
- if (this.model.f_weekcheckdishu === '' || this.model.f_weekcheckdishu === undefined) {
607
- this.$showMessage('请检查你录入的表底数')
608
- return
609
- }
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==='是'){
610
700
  if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
611
701
  this.$showMessage('录入本期表底数不能小于上期表底数！')
612
702
  return
613
703
  }
614
- this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
615
- this.model.f_weekchecknum= this.model.f_weekchecknum?this.model.f_weekchecknum:0
616
- // this.$set(this.model.f_tablesnapsgas,'')
617
- this.model.f_weektablesnapsgas = parseInt(this.model.f_weekcheckdishu)- parseInt(this.model.f_weekchecknum)-parseInt(this.model.f_meter_repair)
618
- if (this.model.f_weekcheckicdishu ) {
619
- this.getWeekCardMessage()
620
- }
621
- },
622
-
623
- commit () {
624
- if ((parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase) < 0) && this.model.f_if_change!=='是') {
625
- this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
626
- return
627
- }
628
- if(this.model.f_check_install){
629
- this.model.f_weekcheck = 1
630
- }
631
- if(this.model.f_check_unstall){
632
- this.model.f_weekcheck = 0
633
- }
634
- if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
635
- if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
636
- this.$showMessage('录入本期表底数不能小于上期表底数！')
637
- return
638
- }
639
- // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
640
- // this.$showMessage('录入本期表底数不能小于上期表底数！')
641
- // return
642
- // }
643
- }
644
- // if (!(this.model.imgName && this.model.imgName.length > 0)) {
645
- // this.$showMessage('请录入抄表照片！')
704
+ // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
705
+ // this.$showMessage('录入本期表底数不能小于上期表底数！')
646
706
  // return
647
707
  // }
648
- if (!this.flag) {
649
- this.$showMessage(`系统正在进行抄表，请勿重复操作！`)
650
- // this.$showAlert('系统正在进行抄表，请勿重复操作！', 'warning', 2000)
651
- return
652
- }
653
- if(this.model.lastImgName){
654
- this.model.lastImgName = `.${this.model.f_user_name}${this.model.imgName.substring(this.model.imgName.indexOf('.'))}`
655
- }
656
- // 设置抄表按钮不可用
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
+ // 抄表完成设置按钮可用
657
736
  this.flag = false
658
- // 将用户编号放入抄表照片名中
659
- console.log(this.model.lastImgName)
660
- this.model.f_oughtamount = parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase)
661
- // this.model.f_last_hand_date = Util.getBeforeMonth(this.model.f_hand_date)
662
- // this.model.f_last_hand_date =
663
- this.model.f_new_tablebase = parseInt(this.model.f_new_tablebase)
664
- this.model.f_new_lcd = parseInt(this.model.f_new_lcd)
665
- this.model.f_end_time = this.data.f_end_time
666
- let res = this.$androidUtil.bzLogic('phone-readmeter', this.model, {rejectMsg: null, resolve: null})
667
- console.log(res)
668
- if (res.code === 200) {
669
- console.log('抄表完成！')
670
- // 抄表完成设置按钮可用
671
- this.flag = false
672
- this.$showMessage('抄表成功！')
673
- // this.$showAlert('抄表成功！', 'success', 2000)
674
- // 发送抄表成功事件给父页面
675
- // this.$dispatch('hand-success', this.type)
676
- }else{
677
- console.log('抄表失败')
678
- // 抄表完成设置按钮可用
679
- this.flag = true
680
- // this.$showMessage(`${res.backData.msg}！请前往表单上传重新提交`)
681
- // this.$showAlert(`${res.backData.msg}！请前往表单上传重新提交`, 'danger', 2000)
682
- }
683
- },
684
- //将数据存入本地数据库，下次进入页面回写数据
685
- save(){
686
- if (!this.flag) {
687
- this.$showMessage(`该抄表单已上传成功,请勿重复保存！`)
688
- return
689
- }
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
+ }
690
755
 
691
- if ((parseInt(this.model.f_new_tablebase) - parseInt(this.model.f_last_tablebase)) < 0 && this.model.f_if_change!=='是') {
692
- 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('录入本期表底数不能小于上期表底数！')
693
770
  return
694
771
  }
695
- // window.alert(this.f_check_install)
696
- if(this.model.f_check_install){
697
- this.model.f_weekcheck = 1
698
- }
699
- if(this.model.f_check_unstall){
700
- this.model.f_weekcheck = 0
701
- }
702
- if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
703
- if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
704
- this.$showMessage('录入本期表底数不能小于上期表底数！')
705
- return
706
- }
707
- // if (parseInt(this.model.f_weekcheckdishu) - parseInt(this.model.f_weekchecknum) < 0) {
708
- // this.$showMessage('录入本期表底数不能小于上期表底数！')
709
- // return
710
- // }
711
- }
712
- this.model.f_end_time = this.data.f_end_time
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
- let res = this.$androidUtil.bzLogic('local-save',this.model,{rejectMsg: null, resolve: null})
716
- if(res.status === 200){
717
- // this.flag = false
718
- this.$showMessage('本地数据保存成功！')
719
- // this.$showAlert('本地数据保存成功!', 'success', 2000)
720
- }
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)
721
785
  }
722
786
  }
723
787
  }
788
+ }
724
789
  </script>
725
790
  <style scoped>
726
- .mt-5 {
727
- margin-top: 5px;
728
- }
729
- .mt-10 {
730
- margin-top: 10px;
731
- }
732
- .mt-20 {
733
- margin-top: 20px;
734
- }
735
- .app-row-none-border {
736
- background-color: white;
737
- padding: 10px 10px 0 10px;
738
- }
739
- .font{
740
- font: 17px PingFang-SC-Medium;
741
- color: #666666
742
- }
743
- .show-font{
744
- font: 17px PingFang-SC-Medium;
745
- color: #333333
746
- }
747
- .btn-font{
748
- font:600 16px PingFang-SC-Bold;
749
- color: #499EDF;
750
- }
751
- .head{
752
- font-size: 1.25em;
753
- font-weight: bolder;
754
- padding: 0.5em;
755
- }
756
- .btn-color{
757
- background-color: #FFFFFF;
758
- border-radius: 10px ;
759
- border: 1px solid #499EDF;
760
- }
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
+ }
761
826
  </style>