sale-client 4.2.74 → 4.2.76

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

@@ -638,7 +638,7 @@
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
           if (this.row.f_isdecimal === '是') {
-            this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
+            this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
           } else {
             this.model.f_pregas = parseInt(getGas.data.gas)
           }

package/src/filiale/meihekou/common/userinfo_detail/ic_detail/MachineRecordQuery.vue

@@ -1,281 +1,281 @@
-<template >
-  <div class="flex" style="justify-content: space-between;">
-    <div @keyup.enter="search" style="">
-      <criteria-paged :model="model" v-ref:paged>
-        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
-
-          <div class="form-horizontal select-overspread container-fluid auto " novalidate partial>
-            <div class="row">
-
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">开始时间</label>
-                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
-                            class="datepicker"
-                            condition="f_operate_date >= '{} 00:00:00' "
-                            placeholder="起始时间"
-                            style="width:60%"
-                            v-model="model.f_start_date"
-                ></datepicker>
-              </div>
-              <div class="col-sm-2 form-group" >
-                <label class="font_normal_body" >结束时间</label>
-                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
-                            class="datepicker"
-                            condition="f_operate_date <= '{} 23:59:59' "
-                            placeholder="结束时间"
-                            style="width:60%"
-                            v-model="model.f_end_date"
-                ></datepicker>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">是否有效</label>
-                <v-select :value.sync="model.f_state" v-model='model.f_state'
-                          style="width:60%"
-                          :options='$parent.$parent.isstates' placeholder='是否有效'
-                          close-on-select
-                          condition="f_state = '{}'"></v-select>
-              </div>
-
-
-              <div style="float: right">
-                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
-                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :printview="true" :is-selected="true" :model="$parent.$parent.model"
-                            @print-close="$parent.$parent.print()" @print-data="$parent.$parent.print()" print-name="购气流水"></print-data>
-                <export-excel
-                  :data="{condition: $parent.$parent.model.condition}"
-                  :field="$parent.$parent.fields"
-                  sqlurl="api/af-revenue/logic/saleExport"sql-name="machineRecordQuery"
-                  template-name='机表流水查询'
-                  :choose-col="true">
-                </export-excel>
-              </div>
-            </div>
-
-          </div>
-        </criteria>
-        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th><nobr>用户编号</nobr></th>
-              <th><nobr>姓名</nobr></th>
-              <th><nobr>住址</nobr></th>
-              <th><nobr>上期底数</nobr></th>
-              <th><nobr>本期底数</nobr></th>
-              <th><nobr>气量</nobr></th>
-              <th><nobr>应交</nobr></th>
-              <th><nobr>缴费金额 </nobr></th>
-              <th><nobr>上期结余</nobr></th>
-              <th><nobr>本期结余</nobr></th>
-              <th><nobr>操作类型</nobr></th>
-              <th><nobr>操作员 </nobr></th>
-              <th><nobr>操作时间 </nobr></th>
-              <th><nobr>状态 </nobr></th>
-              <th><nobr>备注</nobr></th>
-            </tr>
-          </template>
-          <template partial='body' partial='list' v-ref:grid>
-            <tr >
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_userinfo_code}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_user_name}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_address}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_last_tablebase}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_tablebase}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_type== '机表收费'? '' : row.gas}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_type == '机表收费'? '' : row.fee}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_type == '抄表记录'? '' : row.f_collection}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{ row.f_curbalance }}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_type}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_operator}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_operate_date}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_state}}</td>
-              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_comments}}</td>
-            </tr>
-          </template>
-          <template partial='foot'></template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-    <table class="table-hover">
-      <tr class="table-bordered" style="position: relative">
-        <td
-          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
-          汇总信息
-        </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          气量合计:&emsp;{{model.sums.gas.toFixed(2)}}
-        </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          金额合计:&emsp;{{model.sums.fee.toFixed(2)}}
-        </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          缴费合计:&emsp;{{model.sums.collection.toFixed(2)}}
-        </td>
-      </tr>
-    </table>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass, PagedList} from 'vue-client'
-
-  export default {
-    title: '操作查询',
-    data () {
-      return {
-        condition: '1=1',
-        model: new PagedList('api/af-revenue/sql/machineRecordQuery', 20, {}, {
-          fee: 0,
-          gas: 0
-        }),
-        isstates: this.$appdata.getParam('是否有效') ? [{
-          label: '全部',
-          value: ''
-        }, ...this.$appdata.getParam('是否有效')] : [],
-        // 控制单选
-        radio: [],
-        // 选中的页
-        all: [],
-        searchValue: 'f_userfiles_id',
-        // row数据
-        rowsdata: [],
-        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址','f_last_tablebase': '上期底数','f_tablebase': '本期底数',  'fee': '金额', 'gas': '气量', 'f_type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
-        defaultfield: [
-          'f_userinfo_code', 'f_user_name', 'fee', 'gas', 'f_type', 'f_operate_date'
-        ],
-        printModel: {
-          rows: []
-        }
-      }
-    },
-    props: ['row'],
-    ready () {
-      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
-      this.$refs.paged.$refs.criteria.search()
-    },
-    methods: {
-      async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
-        this.model.search(this.condition, this.model)
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-revenue/sql/machineRecordQuery', {
-          data: {
-            condition: this.condition
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        // 计算不包含 "机表收费" 的 gas 总和
-        let gasTotal = res.data.reduce((sum, row) => {
-          return row.f_type === '机表收费' ? sum : sum + (row.gas || 0);
-        }, 0);
-
-        // 计算费用总和
-        let feeTotal = res.data.reduce((sum, row) => {
-          return row.f_type === '机表收费' ? sum : sum + (row.fee || 0);
-        }, 0);
-        // 计算缴费总和
-        let collectionTotal = res.data.reduce((sum, row) => {
-          return sum + (row.f_collection || 0)
-        }, 0)
-
-        this.printModel.rows = res.data
-        this.model.sums = {
-          gas: gasTotal,
-          fee: feeTotal,
-          collection: collectionTotal
-        }
-      },
-      // 多选框初始化
-      selectInit () {
-        this.rowsdata = []
-        this.all = []
-        this.radio = []
-      },
-      print () {
-        this.selectInit()
-      },
-      select () {
-        let index = this.model.pageIndex - 1
-        if (!this.radio[index]) {
-          this.radio.$set(index, [])
-        }
-        if (this.all[index]) {
-          // 数据
-          this.rowsdata[index] = Object.assign([], this.model.rows)
-          // 勾选
-          for (var i = 0; i < this.model.rows.length; i++) {
-            this.radio[index].$set(i, true)
-          }
-        } else {
-          // 数据
-          this.rowsdata[index] = []
-          // 不勾选
-          for (var i = 0; i < this.model.rows.length; i++) {
-            this.radio[index].$set(i, false)
-          }
-        }
-        let z = 0
-        this.printModel.rows = []
-        for (let i = 0; i < this.all.length; i++) {
-          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
-            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
-              this.printModel.rows[z++] = this.rowsdata[i][j]
-            }
-          }
-        }
-      },
-      selectOne (event, row, i) {
-        let index = this.model.pageIndex - 1
-        if (!this.rowsdata[index]) {
-          this.rowsdata[index] = []
-        }
-        if (!this.radio[index]) {
-          this.radio.$set(index, [])
-        }
-        if (event.target.checked) {
-          // 数据
-          this.rowsdata[index][i] = row
-          // 勾选
-          this.radio[index].$set(i, true)
-          // 判断是否全部选中
-          var allState = true
-          if (this.model.rows.length != this.radio[index].length) {
-            allState = false
-          }
-          for (var state of this.radio[index]) {
-            if (!state) {
-              allState = false
-            }
-          }
-          this.all.$set(index, allState)
-        } else {
-          // 数据
-          this.rowsdata[index][i] = []
-          // 不勾选
-          this.radio[index].$set(i, false)
-          // 任意取消一个则全选状态设为false
-          this.all.$set(index, false)
-        }
-        let z = 0
-        this.printModel.rows = []
-        for (let i = 0; i < this.all.length; i++) {
-          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
-            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
-              this.printModel.rows[z++] = this.rowsdata[i][j]
-            }
-          }
-        }
-      }
-    },
-    computed: {
-      ischecked () {
-        return function (index, i) {
-          if (!this.radio[index]) {
-            return false
-          }
-          return this.radio[index][i]
-        }
-      }
-    }
-  }
-</script>
-
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+
+          <div class="form-horizontal select-overspread container-fluid auto " novalidate partial>
+            <div class="row">
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_operate_date >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" >结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_operate_date <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">是否有效</label>
+                <v-select :value.sync="model.f_state" v-model='model.f_state'
+                          style="width:60%"
+                          :options='$parent.$parent.isstates' placeholder='是否有效'
+                          close-on-select
+                          condition="f_state = '{}'"></v-select>
+              </div>
+
+
+              <div style="float: right">
+                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :printview="true" :is-selected="true" :model="$parent.$parent.model"
+                            @print-close="$parent.$parent.print()" @print-data="$parent.$parent.print()" print-name="购气流水"></print-data>
+                <export-excel
+                  :data="{condition: $parent.$parent.model.condition}"
+                  :field="$parent.$parent.fields"
+                  sqlurl="api/af-revenue/logic/saleExport"sql-name="machineRecordQuery"
+                  template-name='机表流水查询'
+                  :choose-col="true">
+                </export-excel>
+              </div>
+            </div>
+
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>用户编号</nobr></th>
+              <th><nobr>姓名</nobr></th>
+              <th><nobr>住址</nobr></th>
+              <th><nobr>上期底数</nobr></th>
+              <th><nobr>本期底数</nobr></th>
+              <th><nobr>气量</nobr></th>
+              <th><nobr>应交</nobr></th>
+              <th><nobr>缴费金额 </nobr></th>
+              <th><nobr>上期结余</nobr></th>
+              <th><nobr>本期结余</nobr></th>
+              <th><nobr>操作类型</nobr></th>
+              <th><nobr>操作员 </nobr></th>
+              <th><nobr>操作时间 </nobr></th>
+              <th><nobr>状态 </nobr></th>
+              <th><nobr>备注</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_userinfo_code}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_user_name}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_address}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_last_tablebase}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_tablebase}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_type== '机表收费'? '' : row.gas}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_type == '机表收费'? '' : row.fee}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_type == '抄表记录'? '' : row.f_collection}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center;white-space:nowrap;">{{ row.f_curbalance }}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_type}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_operator}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_operate_date}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_state}}</td>
+              <td :class="{'bg-danger' : row.f_whether_pay === '否' }" style="text-align:center">{{row.f_comments}}</td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <table class="table-hover">
+      <tr class="table-bordered" style="position: relative">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          气量合计:&emsp;{{model.sums.gas.toFixed(2)}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          金额合计:&emsp;{{model.sums.fee.toFixed(2)}}
+        </td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+          缴费合计:&emsp;{{model.sums.collection.toFixed(2)}}
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  export default {
+    title: '操作查询',
+    data () {
+      return {
+        condition: '1=1',
+        model: new PagedList('api/af-revenue/sql/machineRecordQuery', 20, {}, {
+          fee: 0,
+          gas: 0
+        }),
+        isstates: this.$appdata.getParam('是否有效') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('是否有效')] : [],
+        // 控制单选
+        radio: [],
+        // 选中的页
+        all: [],
+        searchValue: 'f_userfiles_id',
+        // row数据
+        rowsdata: [],
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址','f_last_tablebase': '上期底数','f_tablebase': '本期底数',  'fee': '金额', 'gas': '气量', 'f_type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
+        defaultfield: [
+          'f_userinfo_code', 'f_user_name', 'fee', 'gas', 'f_type', 'f_operate_date'
+        ],
+        printModel: {
+          rows: []
+        }
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.model.f_state = ['有效']
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      async search () {
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
+        this.model.search(this.condition, this.model)
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/machineRecordQuery', {
+          data: {
+            condition: this.condition
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        // 计算不包含 "机表收费" 的 gas 总和
+        let gasTotal = res.data.reduce((sum, row) => {
+          return row.f_type === '机表收费' ? sum : sum + (row.gas || 0);
+        }, 0);
+
+        // 计算费用总和
+        let feeTotal = res.data.reduce((sum, row) => {
+          return row.f_type === '机表收费' ? sum : sum + (row.fee || 0);
+        }, 0);
+        // 计算缴费总和
+        let collectionTotal = res.data.reduce((sum, row) => {
+          return sum + (row.f_collection || 0)
+        }, 0)
+
+        this.printModel.rows = res.data
+        this.model.sums = {
+          gas: gasTotal,
+          fee: feeTotal,
+          collection: collectionTotal
+        }
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      print () {
+        this.selectInit()
+      },
+      select () {
+        let index = this.model.pageIndex - 1
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model.rows)
+          // 勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+        let z = 0
+        this.printModel.rows = []
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+              this.printModel.rows[z++] = this.rowsdata[i][j]
+            }
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        let index = this.model.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          this.all.$set(index, allState)
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+        let z = 0
+        this.printModel.rows = []
+        for (let i = 0; i < this.all.length; i++) {
+          for (let j = 0; this.rowsdata[i] && j < this.rowsdata[i].length; j++) {
+            if (this.rowsdata[i][j] && this.rowsdata[i][j].f_user_id) {
+              this.printModel.rows[z++] = this.rowsdata[i][j]
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>
+

package/src/filiale/qianneng/machine/IOTMeterCenter.vue

@@ -634,7 +634,7 @@
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
           if (this.row.f_isdecimal === '是') {
-            this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
+            this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
           } else {
             this.model.f_pregas = parseInt(getGas.data.gas)
           }

package/src/filiale/qingtongxia/IOTMeterCenter.vue

@@ -636,7 +636,7 @@ export default {
         // 通过收款进行划价
         let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
         if (this.row.f_isdecimal === '是') {
-          this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
+          this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
         } else {
           this.model.f_pregas = parseInt(getGas.data.gas)
         }