readmeter-changan 1.0.42 → 1.0.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.idea/workspace.xml
CHANGED
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
5
5
|
</component>
|
|
6
6
|
<component name="ChangeListManager">
|
|
7
|
-
<list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡"
|
|
7
|
+
<list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
|
|
8
|
+
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
9
|
+
<change beforePath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" afterDir="false" />
|
|
10
|
+
<change beforePath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandplanInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandplanInfo.vue" afterDir="false" />
|
|
11
|
+
</list>
|
|
8
12
|
<option name="SHOW_DIALOG" value="false" />
|
|
9
13
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
10
14
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -233,7 +237,7 @@
|
|
|
233
237
|
"WebServerToolWindowFactoryState": "false",
|
|
234
238
|
"git-widget-placeholder": "changan",
|
|
235
239
|
"kotlin-language-version-configured": "true",
|
|
236
|
-
"last_opened_file_path": "D:/WorkSpace/module/
|
|
240
|
+
"last_opened_file_path": "D:/WorkSpace/module/TelephoneClient",
|
|
237
241
|
"node.js.detected.package.eslint": "true",
|
|
238
242
|
"node.js.detected.package.tslint": "true",
|
|
239
243
|
"node.js.selected.package.eslint": "(autodetect)",
|
|
@@ -419,6 +423,8 @@
|
|
|
419
423
|
<workItem from="1753320827001" duration="1546000" />
|
|
420
424
|
<workItem from="1753927585913" duration="2588000" />
|
|
421
425
|
<workItem from="1760685783403" duration="753000" />
|
|
426
|
+
<workItem from="1768962396488" duration="1138000" />
|
|
427
|
+
<workItem from="1769756231076" duration="646000" />
|
|
422
428
|
</task>
|
|
423
429
|
<task id="LOCAL-00001" summary="新增卡表抄表气量核算">
|
|
424
430
|
<created>1553677761707</created>
|
package/package.json
CHANGED
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
<input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
|
|
111
111
|
</div>
|
|
112
112
|
</div>
|
|
113
|
-
<div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12"
|
|
113
|
+
<div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" >
|
|
114
114
|
<p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">IC卡累计</p>
|
|
115
115
|
<div class="col-xs-8 col-sm-8 col-md-8 ">
|
|
116
116
|
<input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
|
|
@@ -699,6 +699,9 @@ export default {
|
|
|
699
699
|
this.$showMessage('录入本期表底数不能小于上期表底数！请核对抄表数据')
|
|
700
700
|
return
|
|
701
701
|
}
|
|
702
|
+
if(!this.model.f_checkic1){
|
|
703
|
+
this.$showMessage('请输入IC卡累计！！！')
|
|
704
|
+
}
|
|
702
705
|
if(this.model.f_check_install){
|
|
703
706
|
this.model.f_weekcheck = 1
|
|
704
707
|
}
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
<input type="text" id="f_datacomparison" class="form-control font " v-model="model.f_result_state" readonly>
|
|
111
111
|
</div>
|
|
112
112
|
</div>
|
|
113
|
-
<div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12"
|
|
113
|
+
<div class="row auto bg-white app-row col-xs-12 col-sm-12 col-md-12" >
|
|
114
114
|
<p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">IC卡累计</p>
|
|
115
115
|
<div class="col-xs-8 col-sm-8 col-md-8 ">
|
|
116
116
|
<input type="text" id="" class="form-control font " v-model="model.f_checkic1" @blur="checkbyic1()">
|
|
@@ -521,7 +521,9 @@
|
|
|
521
521
|
// },
|
|
522
522
|
|
|
523
523
|
commit () {
|
|
524
|
-
|
|
524
|
+
if(!this.model.f_checkic1){
|
|
525
|
+
this.$showMessage('请输入IC卡累计！！！')
|
|
526
|
+
}
|
|
525
527
|
|
|
526
528
|
if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){
|
|
527
529
|
if (this.f_weektablesnapsgas < 0 && this.model.f_if_change!=='是') {
|