sale-client 3.7.62 → 3.7.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.7.62",
+  "version": "3.7.63",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/business/IOTMeterCenter.vue

@@ -459,7 +459,7 @@
       }
       console.log('获取到的欠费记录', owes)
       self.alldue_fee = owes.reduce((total, item) => {
-        return total + (item.f_oughtfee + item.overdue)
+        return total + (item.f_oughtfee + item.overdue - item.f_debt_money)
       }, 0)
       console.log('总欠费金额为', self.alldue_fee)
       self.owes = res.data

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -339,7 +339,7 @@ export default {
           return
         }
       }
-      if (this.model.metermessage.f_meter_type[0] == '机表') {
+      if (this.model.metermessage.f_meter_type[0] != '机表') {
         console.log('进来了')
         if (this.books.data.length > 0) {
           console.log('进来了2')
@@ -671,10 +671,10 @@ export default {
       console.log('获取到的欠费记录', books)
       this.books = books
       // 如果是机表验证是否有欠费
-      // if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
-      //   this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
-      //   this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
-      // }
+      if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
+        this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
+        this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+      }
     }
   },
 

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -179,7 +179,6 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
-                        :disabled ="isedit"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="reset"

package/src/filiale/jingyang/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2016",
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "skipLibCheck": true
-  }
-}

package/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2016",
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "skipLibCheck": true
-  }
-}