readmeter-changan 1.0.43 → 1.0.45

package/.idea/workspace.xml

@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandplanInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/PhoneHandplanInfo.vue" afterDir="false" />
     </list>
@@ -237,7 +238,7 @@
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
     &quot;git-widget-placeholder&quot;: &quot;changan&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/TelephoneClient&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/WorkSpace/module/ReadMeterClient&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -424,7 +425,9 @@
       <workItem from="1753927585913" duration="2588000" />
       <workItem from="1760685783403" duration="753000" />
       <workItem from="1768962396488" duration="1138000" />
-      <workItem from="1769756231076" duration="646000" />
+      <workItem from="1769756231076" duration="2285000" />
+      <workItem from="1770189687384" duration="597000" />
+      <workItem from="1770629756764" duration="4201000" />
     </task>
     <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
       <created>1553677761707</created>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "readmeter-changan",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "手机抄表客户端",
   "author": "15529257852@163.com",
   "private": false,

package/src/components/readingmeter/CheckInfo.vue

@@ -435,7 +435,9 @@ export default {
         imgName: '',
         sumgas_moment:0,
         f_datacomparison:0,
+        f_weekicsnapsgas:0,
         f_weekcheckmeternum:'',
+        f_weektablesnapsgas:0,
         f_weekchecktime:Util.toStandardTimeString(),
         f_weekcheckicsn:'',
         f_weekchecksn:'',
@@ -633,21 +635,12 @@ export default {
       }
 
       let postdata = Object.assign({},this.model)
-      postdata.week = '1',
-
-        this.model.f_pregas = this.model.f_pregas?this.model.f_pregas:0
-      this.model.f_sumgas_moment = this.model.f_sumgas_moment?this.model.f_sumgas_moment:0
-      let res = this.$androidUtil.bzLogic('gasComputation', postdata,{rejectMsg: null, resolve: null})
-      this.model.f_hasnotcharge = parseInt(res.hasnotCharge)
-      this.model.f_hascharge = (parseInt(this.model.f_sumgas_moment)+ parseInt(this.model.f_nogasvalue) - parseInt(this.model.f_hasnotcharge))
-      console.log('本期已充'+this.model.f_hascharge)
+      postdata.week = '1'
       this.model.f_weekcheckicnum= this.model.f_weekcheckicnum?this.model.f_weekcheckicnum:0
-      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))
+      this.model.f_weekicsnapsgas = (parseInt(this.model.f_weekcheckicnum)- parseInt(this.model.f_weekcheckicdishu))
       console.log('IC走气'+this.model.f_icsnapsgas)
-      this.model.f_check_result_state = res.f_result_state
+      this.model.f_check_result_state = Math.abs(parseInt(this.model.f_weekicsnapsgas)-parseInt(this.model.f_weektablesnapsgas))<=this.model.f_tablewitherrorvalue?'正常':'异常'
       console.log('抄表状态'+this.model.f_result_state)
-      this.model.f_datacomparison = (parseInt(this.model.f_icsnapsgas)-parseInt(this.model.f_tablesnapsgas))
-      this.model.f_curbalance = parseInt(this.model.f_new_lcd * this.model.f_price)
       console.log('剩余金额'+this.model.f_curbalance)
     },
     //获取基表走气量
@@ -674,9 +667,7 @@ export default {
 
     //获取基表走气量
     getWeekMeterMessage(){
-      // if(this.model.f_weekcheck&&this.model.f_weekcheck ==='1'&& this.model.f_weekcheckdishu){
-      //  this.model.f_weekcheckdishu = this.model.f_new_tablebase
-      // }
+      console.log(1)
       if (this.model.f_weekcheckdishu === '' || this.model.f_weekcheckdishu === undefined) {
         this.$showMessage('请检查你录入的表底数')
         return
@@ -687,7 +678,7 @@ export default {
       }
       this.model.f_meter_repair= this.model.f_meter_repair?this.model.f_meter_repair:0
       this.model.f_weekchecknum= this.model.f_weekchecknum?this.model.f_weekchecknum:0
-      // this.$set(this.model.f_tablesnapsgas,'')
+      // this.$set(this.model.f_weektablesnapsgas,'')
       this.model.f_weektablesnapsgas = parseInt(this.model.f_weekcheckdishu)- parseInt(this.model.f_weekchecknum)-parseInt(this.model.f_meter_repair)
       if (this.model.f_weekcheckicdishu ) {
         this.getWeekCardMessage()
@@ -700,7 +691,9 @@ export default {
         return
       }
       if(!this.model.f_checkic1){
+        console.log(this.model.f_checkic1)
         this.$showMessage('请输入IC卡累计！！！')
+        return
       }
       if(this.model.f_check_install){
         this.model.f_weekcheck = 1

package/src/components/readingmeter/PhoneHandplanInfo.vue

@@ -522,7 +522,9 @@
 
       commit () {
         if(!this.model.f_checkic1){
+          console.log(this.model.f_checkic1)
           this.$showMessage('请输入IC卡累计！！！')
+          return
         }
 
         if(this.model.f_weekcheck==='1'||this.model.f_weekcheck==='true'||this.model.f_weekcheck==='是'){