sale-client 3.6.358 → 3.6.359

package/package.json

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

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

@@ -266,7 +266,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(self.row.f_gas_decimal || 4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
         }
       } else {
@@ -313,7 +313,7 @@
       if (self.row.f_project_money && self.row.f_project_money > 0) {
         self.model.getDeduct = (self.$CommonService.getDeduct(self.row, self.model.f_pregas) - 0)
       }
-      self.model.f_preamount = getAmount.data.chargenum.toFixed(self.row.f_fee_decimal || 4)
+      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
       self.model.f_totalcost = ((self.row.f_balance - 0) > ((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) ? 0 : (((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice

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

@@ -297,7 +297,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(self.row.f_gas_decimal || 4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
       }
     } else {

package/src/components/common/userinfo_detail/ic_detail/insertKeyUser.vue

@@ -13,14 +13,34 @@
                       :value-single="true"
                       close-on-select></v-select>
           </div>
-          <div class="col-sm-3 form-group" v-if="KeyModel.f_opr_state == '移入'">
-            <label class="font_normal_body col-sm-3">移入原因</label>
-            <input type="text" v-model="KeyModel.f_comments" class="input_search" placeholder="请输入移入原因" >
+          <div class="col-sm-3 form-group" :class="[$v.f_opr_state.required ? 'has-error' : '']" v-if="false">
+            <label class="font_normal_body col-sm-3">操作状态1</label>
+            <input type="text" v-show="false" v-model="KeyModel.f_final_opr_state" v-validate:f_opr_state='{required: true }'>
+            <v-select width="60%"
+                      v-model="KeyModel.f_final_opr_state"
+                      :value.sync="KeyModel.f_final_opr_state"
+                      :options="fstate"
+                      :value-single="true"
+                      close-on-select></v-select>
           </div>
-          <div class="col-sm-3 form-group" v-if="KeyModel.f_opr_state == '移出'">
-            <label class="font_normal_body col-sm-3">移出原因</label>
-            <input type="text" v-model="KeyModel.f_comments" class="input_search" placeholder="请输入移入原因" >
+          <div class="col-sm-3 form-group" id="f_comments" :class="[$v.f_comments.required ? 'has-error' : 'has-success']" v-if="KeyModel.f_opr_state == '移入'">
+            <label for="f_comments" class=" font_normal_body">移入原因</label>
+            <input  type="text"   v-model="KeyModel.f_comments" v-show="false"
+                    v-validate:f_comments='{required: true }' >
+            <v-select
+              width="60%"
+              :value.sync="KeyModel.f_comments"
+              v-model="KeyModel.f_comments"
+              :options="fcomments"
+              :value-single="true"
+              :close-on-select="false"
+            >
+            </v-select>
           </div>
+<!--          <div class="col-sm-3 form-group" v-if="KeyModel.f_opr_state == '移出'">-->
+<!--            <label class="font_normal_body col-sm-3">移出原因</label>-->
+<!--            <input type="text" v-model="KeyModel.f_comments" class="input_search" placeholder="请输入移入原因" >-->
+<!--          </div>-->
           <div v-if="KeyModel.f_opr_state == '移入'">
             <div class="col-sm-3 form-group" :class="[$v.f_level.required ? 'has-error' : '']">
               <label class="font_normal_body col-sm-3">管控级别</label>
@@ -68,7 +88,6 @@
     <div style="color: #0d8ddb; font-size: 25px; margin-top: 15px; margin-bottom: 10px; margin-left: 25px">限购配置</div>
     <validator name='v'>
       <form novalidate class="form-horizontal">
-
         <div class="row">
           <div class="col-sm-3 form-group" :class="[$v.f_third_pay.required ? 'has-error' : '']">
             <label class="font_normal_body col-sm-3" >第三方缴费</label>
@@ -228,9 +247,10 @@ export default {
   data () {
     return {
       KeyModel: {
+        f_final_opr_state: '移出',
         f_opr_state:'移入',
         f_comments: '',
-        f_function: '',
+        f_function: '限制购气',
         f_level:'',
         f_remark:''
       },
@@ -256,10 +276,8 @@ export default {
       fstate: [{label: '移入', value: '移入'},{label: '移出', value: '移出'}],
       flevel: [{label: '高', value: '高'},{label: '中', value: '中'},{label: '低', value: '低'}],
       nolimitGas:[{label: '是', value:'0'},{label: '否', value:'1'}],
-      fFunction: this.$appdata.getParam('限制功能') ? [{
-        label: '全部',
-        value: ''
-      }, ...this.$appdata.getParam('限制功能')] : [],
+      fFunction: [{label: '限制购气', value:'限制购气'},{label: '禁止缴费退款', value:'禁止缴费退款'},{label: '禁止开阀', value:'禁止开阀'},{label: '禁止换表', value:'禁止换表'},{label: '禁止补退气', value:'禁止补退气'},{label: '下发强制关阀', value:'下发强制关阀'}],
+      fcomments:this.$appdata.getParam('移入原因') ? [ ...this.$appdata.getParam('移入原因')] : []
     }
       },
   props: ['show', 'f_price_id', 'f_userinfo_id','row','userOperationState'],
@@ -285,14 +303,19 @@ export default {
       }
     },
     async confirm (type) {
+      console.log('确认移入重点用户', this.$login.r)
       if (this.userOperationState === '移入') {
         this.$showMessage(`${type}失败, 用户已被移入重点用户, 请先移出重点用户`);
         return;
       }
-      if (type == '取消拉黑' && !this.$login.r.find(value => value == '取消拉黑')) {
+      if (type == '移出重点用户' && !this.$login.r.find(value => value == '取消拉黑')) {
         this.$showMessage('你没有移出重点用户的权限,请联系管理员!')
         return
       }
+      if (type == '移入重点用户' && !this.$login.r.find(value => value == '新增黑名单')) {
+        this.$showMessage('你没有移入重点用户的权限,请联系管理员!')
+        return
+      }
       let data = {
         f_operat_type: type,
         f_state: '待审核',
@@ -318,6 +341,7 @@ export default {
         f_limit_amount: this.model.f_limit_amount,
         f_limit_value: this.model.f_limit_value,
         f_opr_state: this.KeyModel.f_opr_state,
+        f_final_opr_state: this.KeyModel.f_final_opr_state,
         f_level: this.KeyModel.f_level,
         f_function:this.KeyModel.f_function
       }
@@ -335,6 +359,10 @@ export default {
         this.$showMessage(`${operateType}失败,用户不是重点用户,请先移入重点用户`)
         return
       }
+      if (res.data.code == 503) {
+        this.$showMessage(`${operateType}失败,该用户已提交移出重点用户审核，请联系管理员处理`)
+        return
+      }
       this.initModel()
       this.$dispatch('success')
       this.$emit('cancel')

package/src/components/newBill/CardMeterCenter.vue

@@ -247,7 +247,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListRecord.vue

@@ -4,25 +4,19 @@
       <template partial='head'>
         <tr>
           <th style="text-align: center;">序号</th>
-          <th style="text-align: center;">移入（移出）原因</th>
-          <th style="text-align: center;">管控级别</th>
-          <th style="text-align: center;">限制功能</th>
-          <th style="text-align: center;">备注</th>
-          <th style="text-align: center;">操作状态</th>
+          <th style="text-align: center;">操作类型</th>
           <th style="text-align: center;">操作时间</th>
           <th style="text-align: center;">操作人</th>
+          <th style="text-align: center;">原因</th>
         </tr>
       </template>
       <template partial='body'>
         <tr>
           <td style="text-align: center;">{{$index+1}}</td>
-          <td style="text-align: center;">{{row.f_comments}}</td>
-          <td style="text-align: center;">{{row.f_level}}</td>
-          <td style="text-align: center;">{{$parent.$parent.formatFunction(row.f_function)}}</td>
-          <td style="text-align: center;">{{row.f_remark}}</td>
-          <td style="text-align: center;">{{row.f_opr_state}}</td>
+          <td style="text-align: center;">{{row.f_operat_type}}</td>
           <td style="text-align: center;">{{row.f_operate_date}}</td>
           <td style="text-align: center;">{{row.f_operator}}</td>
+          <td style="text-align: center;">{{row.f_comments}}</td>
         </tr>
       </template>
       <template partial='foot'></template>
@@ -31,50 +25,36 @@
 </template>
 
 <script>
-  import {HttpResetClass} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-  let initGen = async function (self, val) {
-    let http = new HttpResetClass()
-    console.log(self.$login.f, '================')
-    let res = await http.load('POST', 'rs/sql/sale_getBlackListRecord', {data: {condition: `t.f_userinfo_id=${self.data.f_userinfo_id} and f_orgid = ${self.$login.f.orgid}` }}, {resolveMsg: null, rejectMsg: null})
-    self.model = Object.assign({}, self.model, val)
-    self.model.rows = res.data
-  }
-  export default {
-    props: ['data'],
-    data () {
-      return {
-        model: {
-          rows: []
-        }
-      }
-    },
-    watch: {
-      'data' (val) {
-        if (val) {
-          initGen(this, val)
-        }
-      }},
-
-    ready () {
-      initGen(this, this.data)
-    },
-    methods: {
-      formatFunction (functionString) {
-        if (!functionString) return ''
-        try {
-          // 解析 JSON 字符串为数组
-          let functionArray = JSON.parse(functionString)
-          // 将数组转换为用逗号分隔的字符串
-          return functionArray.join(', ')
-        } catch (e) {
-          // 如果解析失败，返回原始字符串
-          return functionString
-        }
+let initGen = async function (self, val) {
+  let http = new HttpResetClass()
+  console.log(self.$login.f, '================')
+  let res = await http.load('POST', 'rs/sql/sale_getBlackListRecord', {data: {condition: `f_userinfo_id=${self.data.f_userinfo_id} and f_orgid = ${self.$login.f.orgid}` }}, {resolveMsg: null, rejectMsg: null})
+  self.model = Object.assign({}, self.model, val)
+  self.model.rows = res.data
+}
+export default {
+  props: ['data'],
+  data () {
+    return {
+      model: {
+        rows: []
       }
     }
+  },
+  watch: {
+    'data' (val) {
+      if (val) {
+        initGen(this, val)
+      }
+    }},
 
+  ready () {
+    initGen(this, this.data)
   }
+
+}
 </script>
 <style>
 

package/src/components/revenue/comprehen/SpecialUser/SpecialUserManage.vue

@@ -7,7 +7,7 @@
       <tabs header="黑名单管理" v-if="permission('黑名单管理')">
         <black-list-mangae   @deal-msg="dealMsg"></black-list-mangae>
       </tabs>
-      <tabs header="黑名单记录查询"  v-if="permission('黑名单记录查询')">
+      <tabs header="黑名单记录查询"  v-if="permission('重点用户记录查看')">
         <black-record-query  @deal-msg="dealMsg"></black-record-query>
       </tabs>
     </tab-button>

package/src/filiale/alashan/business/CardMeterCenter.vue

@@ -241,7 +241,7 @@
           if (self.row.f_collection_type === '按金额') {
             self.dymoney = 0
           } else {
-            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
             self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
           }
         } else {

package/src/filiale/bayan/CardMeterCenter.vue

@@ -263,7 +263,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(self.row.f_gas_decimal || 4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
         }
       } else {
@@ -299,7 +299,7 @@
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
-      self.model.f_preamount = getAmount.data.chargenum.toFixed(self.row.f_fee_decimal || 4)
+      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
       self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice

package/src/filiale/bayan/ShowCardSellGas.vue

@@ -297,7 +297,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(self.row.f_gas_decimal || 4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
       }
     } else {

package/src/filiale/fugu/business/CardMeterCenter.vue

@@ -310,7 +310,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(self.row.f_gas_decimal || 4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
         }
       } else {
@@ -346,7 +346,7 @@
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
-      self.model.f_preamount = getAmount.data.chargenum.toFixed(self.row.f_fee_decimal || 4)
+      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
       self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice

package/src/filiale/gehua/CardMeterCenter.vue

@@ -238,7 +238,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/gehua/ShowCardSellGas.vue

@@ -273,7 +273,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/guangxi/CardMeterCenter.vue

@@ -238,7 +238,7 @@
           self.dymoney = 0
         } else {
           if (self.row.f_meter_brand !== '秦川IC卡表') {
-            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
             self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
           }
         }

package/src/filiale/guangxi/ShowCardSellGas.vue

@@ -274,7 +274,7 @@ let preamountGen = async function (self) {
         self.dymoney = 0
       } else {
         if (self.row.f_meter_brand !== '秦川IC卡表') {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       }

package/src/filiale/huayin/CardMeterCenter.vue

@@ -246,7 +246,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/jinbin/CardMeterCenter.vue

@@ -286,7 +286,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/jinbin/ShowCardSellGas.vue

@@ -215,7 +215,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         }else{
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/jinjiang/CardMeterCenter.vue

@@ -229,7 +229,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         }else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/kelai/CardMeterCenter.vue

@@ -252,7 +252,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/kelai/ShowCardSellGas.vue

@@ -307,7 +307,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/lixianV3/components/charge/CardMeterCenter.vue

@@ -263,7 +263,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(self.row.f_gas_decimal || 4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
         }
       } else {
@@ -299,7 +299,7 @@
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
-      self.model.f_preamount = getAmount.data.chargenum.toFixed(self.row.f_fee_decimal || 4)
+      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
       self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice

package/src/filiale/macheng/CardMeterCenter.vue

@@ -261,7 +261,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/meihekou/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -85,7 +85,7 @@
   import CardHandRecord from '../../../../components/common/userinfo_detail/ic_detail/CardHandRecord'
   import AutomaticPurse from '../../../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
   import Repurchase from '../../../../components/common/userinfo_detail/ic_detail/Repurchase'
-  import MachineRecordQuery from '../../../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+  import MachineRecordQuery from './ic_detail/MachineRecordQuery'
   // 导入物联网相关查询
   import QueryInstruct from '../../../../components/common/userinfo_detail/iot_detail/QueryInstruct'
   import WatchCollection from '../../../../components/common/userinfo_detail/iot_detail/WatchCollection'