sale-client 3.6.81 → 3.6.83

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://203.57.101.233:8400/', 'http://203.57.101.233:8400/']
+const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -6,12 +6,13 @@
       </header>
       <article slot="modal-body" class="modal-body" style="height: auto" v-show="!showTable">
         <div class="flex-row flex-deviceinfo">
-          <div class="flex-row flex-two-info panel panel-default" v-for="row in devicesinfo">
+          <div class="flex-row flex-two-info panel panel-default" v-for="(index,row) in devicesinfo">
             <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>
             <form class="form-horizontal select-overspread " style="flex: 1;">
               <div style="margin-top: 2%">
                 <img style="margin-top: -2px;margin-left: 2px" src="../../../static/images/lefticon/矩形1183.png">
-                <a style="font-size: 16px;font-weight: 500;">设备基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+                <a style="font-size: 16px;font-weight: 500;">设备基本信息</a>&nbsp;<a
+                style="color: #999999;text-decoration: none"></a>
               </div>
               <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
@@ -23,11 +24,13 @@
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class=" font_normal_body">设备编号</label>
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_no"
+                         @blur="devicesNoBlur(index)"
                          placeholder='设备编号' v-next-el="{id: $index+'brand'}">
                 </div>
               </div>
-              <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_brand && (row.f_devices_type == '壁挂炉' || row.f_devices_type == '热水器') ? 'has-error' : '']">
+              <div class="row auto" style="margin-left: 10px;" v-if="row.f_devices_type != '报警器'">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"
+                     :class="[!row.f_brand && (row.f_devices_type == '壁挂炉' || row.f_devices_type == '热水器') ? 'has-error' : '']">
                   <label class="font_normal_body">设备品牌</label>
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌'
                          v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
@@ -38,14 +41,32 @@
                          placeholder='设备型号' :id="$index+'devicesmodel'">
                 </div>
               </div>
+              <div class="row auto" style="margin-left: 10px;" v-if="row.f_devices_type == '报警器'">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"
+                     :class="[!row.f_brand && (row.f_devices_type == '壁挂炉' || row.f_devices_type == '热水器') ? 'has-error' : '']">
+                  <label class="font_normal_body">设备品牌</label>
+                  <v-select :value.sync="row.f_brand" v-model="row.f_brand"
+                            :options='brands' placeholder='设备品牌' :value-single="true"
+                            :onchange="brandChange(index)"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">设备型号</label>
+                  <v-select :value.sync="row.f_devices_model" v-model="row.f_devices_model"
+                            :options='devicesModel' placeholder='设备型号' :value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+              </div>
               <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">施工单位</label>
                   <v-select :value.sync="row.f_builderunit" v-model="row.f_builderunit"
-                          :options='builders' placeholder='施工单位' :value-single="true"
-                          close-on-select></v-select>
+                            :options='builders' placeholder='施工单位' :value-single="true"
+                            close-on-select></v-select>
                   <!--<input type="text" class="input_search" style="width:60%" v-model="row.f_builderunit"-->
-                         <!--placeholder='施工单位'>-->
+                  <!--placeholder='施工单位'>-->
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">联系电话</label>
@@ -54,15 +75,17 @@
                 </div>
               </div>
               <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[row.f_devices_type == '壁挂炉' && (row.f_input_person == '' || row.f_input_person == null) ? 'has-error' : '']">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"
+                     :class="[row.f_devices_type == '壁挂炉' && (row.f_input_person == '' || row.f_input_person == null) ? 'has-error' : '']">
                   <label class="font_normal_body">安装人&nbsp;&nbsp;&nbsp;</label>
-<!--                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"-->
-<!--                         placeholder='安装人'>-->
+                  <!--                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"-->
+                  <!--                         placeholder='安装人'>-->
                   <v-select :value.sync="row.f_input_person" v-model="row.f_input_person"
                             :options='installperson' placeholder='安装人'
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[row.f_devices_type == '壁挂炉' && row.f_input_date == '' ? 'has-error' : '']">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"
+                     :class="[row.f_devices_type == '壁挂炉' && row.f_input_date == '' ? 'has-error' : '']">
                   <label class="font_normal_body">安装日期</label>
                   <datepicker placeholder="安装日期" style="width: 60%"
                               v-model="row.f_input_date"
@@ -85,7 +108,7 @@
                   <label class="font_normal_body">使用年限</label>
                   <input type="number" class="input_search" style="width: 60%" v-model="row.f_service_life"
                          :value.sync="row.f_service_life"
-                          :onchange="expireDate($index)" >
+                         :onchange="expireDate($index)">
                 </div>
               </div>
               <div class="row auto" style="margin-left: 10px;">
@@ -93,7 +116,7 @@
                   <label class="font_normal_body">到期日期</label>
                   <input type="test" class="input_search" style="width: 60%" v-model="row.f_expire_date"
                          :value.sync="row.f_expire_date"
-                         placeholder="到期日期"  disabled></input>
+                         placeholder="到期日期" disabled></input>
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">设备数量</label>
@@ -107,9 +130,11 @@
                   <label class="font_normal_body" title="用户设备状态">设备状态</label>
                   <v-select :value.sync="row.f_userinfodevices_state" v-model="row.f_userinfodevices_state"
                             :options='userdevicestate' placeholder='设备状态' :value-single="true"
+
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[row.f_devices_type == '壁挂炉' && row.watchpurchase == '' ? 'has-error' : '']">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"
+                     :class="[row.f_devices_type == '壁挂炉' && row.watchpurchase == '' ? 'has-error' : '']">
                   <label class="font_normal_body">购买方式</label>
                   <v-select :value.sync="row.watchpurchase" v-model="row.watchpurchase"
                             :options='WatchPurchases' placeholder='购买方式' :value-single="true"
@@ -128,10 +153,11 @@
                   <input class="input_search" style="width:60%" v-model="row.f_comments"/>
                 </div>
               </div>
-            <div>
-              <img style="margin-top: -2px;margin-left: 2px" src="../../../static/images/lefticon/矩形1183.png">
-              <a style="font-size: 16px;font-weight: 500;">连接管信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
-            </div>
+              <div>
+                <img style="margin-top: -2px;margin-left: 2px" src="../../../static/images/lefticon/矩形1183.png">
+                <a style="font-size: 16px;font-weight: 500;">连接管信息</a>&nbsp;<a
+                style="color: #999999;text-decoration: none"></a>
+              </div>
               <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">管道类型</label>
@@ -164,7 +190,8 @@
                  @click="deleteDevice($index, row)">
           </div>
           <div class="panel panel-default flex-two-info text-center" style="line-height: 164px;">
-            <img :src="imgadd" alt="图片加载失败1" class="img-rounded" style="width: 60px;padding: 10px;cursor: pointer;"
+            <img :src="imgadd" alt="图片加载失败1" class="img-rounded"
+                 style="width: 60px;padding: 10px;cursor: pointer;"
                  @click="addDevice()">
           </div>
         </div>
@@ -178,8 +205,8 @@
       <article slot="modal-body" class="modal-body" style="height: auto" v-show="showTable">
         <div class="row">
           <div class=" text-center">
-            <table  class="table table-striped table-bordered" >
-            <tr align="center">
+            <table class="table table-striped table-bordered">
+              <tr align="center">
                 <th style="text-align: center">序号</th>
                 <th style="text-align: center">设备类型</th>
                 <th style="text-align: center">设备编号</th>
@@ -195,7 +222,7 @@
                 <th style="text-align: center">操作</th>
               </tr>
               <tr style="text-align: center" v-for="row in devicesinfo">
-                <td style="text-align: center;">{{$index + 1}}</td>
+                <td style="text-align: center;">{{ $index + 1 }}</td>
 
                 <td style="text-align: center">{{row.f_devices_type}}</td>
                 <td style="text-align:center">{{row.f_devices_no}}</td>
@@ -234,6 +261,8 @@
 
 <script>
 import moment from 'moment'
+import {HttpResetClass} from "vue-client"
+
 export default {
   title: '表具设备信息',
   data () {
@@ -248,6 +277,8 @@ export default {
       installtype: this.$appdata.getParam('安装方式'),
       userdevicestate: this.$appdata.getParam('用户设备状态'),
       builders: this.$appdata.getParam('施工单位'),
+      brands: [],
+      devicesModel: [],
       f_make_date: '',
       f_expire_date: '',
       f_service_life: 0,
@@ -281,10 +312,46 @@ export default {
     //   return rs
     // },
   },
+  ready () {
+    this.initParams()
+  },
   methods: {
+    async devicesNoBlur (index) {
+      if (!this.devicesinfo[index].id) {
+        if (this.devicesinfo[index].f_devices_type == '报警器') {
+          console.log('看看进来了吗？')
+          let http = new HttpResetClass()
+          let data = {
+            items: 'id',
+            tablename: 't_devices',
+            condition: `f_devices_type = '报警器' and f_devices_no = '${this.devicesinfo[index].f_devices_no}'`,
+            orderitem: 'id'
+          }
+          let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
+          if (res.data.length > 0) {
+            this.$showAlert(`报警器编号必须唯一，请重新输入报警器编号`, 'warning', 3000)
+            this.devicesinfo[index].f_devices_no = ''
+          }
+        }
+      }
+    },
+    async initParams () {
+      let http = new HttpResetClass()
+      let data = {
+        items: 'id,f_brand',
+        tablename: 't_iot_device_brand',
+        condition: `1=1`,
+        orderitem: 'id'
+      }
+      let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取设备品牌失败!'})
+      this.brands = []
+      for (let row of res.data) {
+        this.brands.push({label: row.f_brand, value: `${row.id}`})
+      }
+    },
     showTableBtn () {
       this.showTable = !this.showTable
-      console.log('表具信息',this.devicesinfo)
+      console.log('表具信息', this.devicesinfo)
     },
     expireDate (index) {
       if (this.devicesinfo[index].f_make_date === '' || this.devicesinfo[index].f_make_date === undefined || this.devicesinfo[index].f_service_life === 0 || this.devicesinfo[index].f_service_life === undefined) {
@@ -302,12 +369,36 @@ export default {
         })
       }
     },
+    async brandChange (index) {
+      console.log('this.devicesinfo[index].f_brand', this.devicesinfo[index].f_brand)
+      this.devicesModel = []
+      if (this.devicesinfo.length > 0) {
+        if (this.devicesinfo[index].f_devices_type == '报警器') {
+          if (this.devicesinfo[index].f_brand) {
+            let http = new HttpResetClass()
+            let data = {
+              items: 'id,f_model',
+              tablename: 't_iot_device_model',
+              condition: `f_brand_id = ${this.devicesinfo[index].f_brand}`,
+              orderitem: 'id'
+            }
+            let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取设备型号失败!'})
+            for (let row of res.data) {
+              this.devicesModel.push({label: row.f_model, value: row.id})
+            }
+          }
+        }
+      }
+    },
     deleteDevice (index, row) {
       console.log('删除的信息', row)
       if (row.id) {
         this.$showMessage('此操作无法还原，是否确定要删除此设备？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('rs/logic/deletedevices', {param: row}, {resolveMsg: `成功删除此设备`, rejectMsg: '删除设备失败'}).then((res) => {
+            this.$resetpost('rs/logic/deletedevices', {param: row}, {
+              resolveMsg: `成功删除此设备`,
+              rejectMsg: '删除设备失败'
+            }).then((res) => {
               this.devicesinfo.splice(index, 1)
             })
           }

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -348,7 +348,7 @@ export default {
       // 不是修改直接保存
       if (!this.filechangeDetailsShow) this.confirmation()
     },
-    confirmation () {
+    async confirmation () {
       if (this.fileSaveData.reason && this.fileSaveData.reason !== '其他') {
         this.fileSaveData.modifyReason = this.fileSaveData.reason
       }
@@ -368,8 +368,10 @@ export default {
           this.fileSaveData.userinfo.userfiles.f_depid = parentnameId
         }
       }
-      this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
+      let userinfoid = null
+      await this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
+        userinfoid = res.data.result[0].f_userinfo_id
         if (!this.row) {
           this.$parent.resshow = true
         }
@@ -382,6 +384,51 @@ export default {
         this.seaching = false
         this.$dispatch('error', '档案保存', this.data, error)
       })
+      try {
+        // 如果是物联网表并且设备类型是报警器的话，调用物联监控平台存储报警器信息
+        let http = new HttpResetClass()
+        await this.fileSaveData.userinfo.userfiles.forEach(row => {
+          if (row.f_meter_classify == '物联网表') {
+            if (row.devicesinfo.length > 0) {
+              row.devicesinfo.forEach(obj => {
+                if (obj.f_devices_type == '报警器') {
+                  let param = {
+                    userinfoId: userinfoid,
+                    deviceNo: obj.f_devices_no,
+                    state: 1,
+                    brandId: obj.f_brand,
+                    modelId: obj.f_devices_model,
+                    inputtor: obj.f_operator,
+                    inputDate: this.$login.toStandardTimeString(),
+                    installDate: obj.f_input_date
+                  }
+                  if (obj.f_input_person.length > 0) {
+                    param.installPerson = obj.f_input_person[0]
+                  }
+                  if (!obj.id) {
+                    http.load('POST', '/webmeter/rs/logic/deviceSyncIotDevice', {data: param}, {resolveMsg: null, rejectMsg: null})
+                  } else {
+                    let data = {
+                      items: 'id',
+                      tablename: 't_iot_device',
+                      condition: `f_device_no = '${obj.f_devices_no}'`,
+                      orderitem: 'id'
+                    }
+                    http.load('POST', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: null})
+                      .then(res => {
+                        if (res.data.length > 0) {
+                          http.load('POST', '/webmeter/rs/logic/deviceSyncIotDevice', {data: param}, {resolveMsg: null, rejectMsg: null})
+                        }
+                      })
+                  }
+                }
+              })
+            }
+          }
+        })
+      } catch (e) {
+        console.log(e)
+      }
     },
     convertBase64ToBlob (base64String) {
         // 将base64解码

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

@@ -88,13 +88,13 @@
             <div class="col-sm-4">
               <label for="f_balance" class="font_normal_body">上期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
-                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+                     v-scale="[model.f_balance, row.f_fee_decimal||4]" placeholder="上期结余" disabled>
             </div>
 
             <div class="col-sm-4">
               <label for="f_curbalance" class="font_normal_body">&nbsp;本期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="curbalance"
-                     v-scale="[curbalance, 4]" placeholder="本期结余" disabled>
+                     v-scale="[curbalance, row.f_fee_decimal||4]" placeholder="本期结余" disabled>
             </div>
 
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && !config.calculatePreByCollection"
@@ -103,7 +103,7 @@
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''"/>
+                     v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
                  :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
@@ -119,13 +119,13 @@
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px"
@@ -135,7 +135,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, 4]" :disabled="!config.calculatePreByCollection">
+                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection">
             </div>
             <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -161,12 +161,12 @@
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
-                     v-scale="[model.f_privilege_money, 2]" placeholder="优惠金额" disabled>
+                     v-scale="[model.f_privilege_money, row.f_fee_decimal||4]" placeholder="优惠金额" disabled>
             </div>
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
-                     v-scale="[model.f_after_discount, 2]" placeholder="优惠后收款" disabled>
+                     v-scale="[model.f_after_discount, row.f_fee_decimal||4]" placeholder="优惠后收款" disabled>
             </div>
           </div>
 

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

@@ -32,7 +32,7 @@
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
               <input class="input_search" style="width:60%" @blur="preamount()" type="number" v-model="model.f_preamount"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
-                     v-scale="[model.f_preamount, 2]" placeholder="预购金额" >
+                     v-scale="[model.f_preamount, row.f_fee_decimal||4]" placeholder="预购金额" >
             </div>
           </div>
           <div class="row" style="margin-top:6px;">
@@ -70,20 +70,20 @@
               <input class="input_search" style="width:60%" type="number"
                      @blur="preamount()" v-model="model.f_totalcost"
                      v-validate:f_totalcost='{required: true, dctest: [0, ">=" ] }' placeholder="应收金额"
-                     v-next-el='sk' v-scale="[model.f_totalcost, 2]" disabled>
+                     v-next-el='sk' v-scale="[model.f_totalcost, row.f_fee_decimal||4]" disabled>
             </div>
           </div>
           <div class="row">
             <div class="col-sm-4 form-group">
               <label for="f_balance" class="font_normal_body">上期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
-                     v-scale="[model.f_balance, 2]" placeholder="上期结余" disabled>
+                     v-scale="[model.f_balance, row.f_fee_decimal||4]" placeholder="上期结余" disabled>
             </div>
 
             <div class="col-sm-4 form-group">
               <label for="f_curbalance" class="font_normal_body">本期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="curbalance"
-                     v-scale="[model.f_curbalance, 2]" placeholder="本期结余" disabled>
+                     v-scale="[model.f_curbalance, row.f_fee_decimal||4]" placeholder="本期结余" disabled>
             </div>
 
 <!--            <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按气量'  && model.f_payment!='赠气'"-->
@@ -102,7 +102,7 @@
             <div class="col-sm-3 form-group">
               <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     v-el:sk v-scale="[model.f_collection, 2]" disabled>
+                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" disabled>
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -127,12 +127,12 @@
             <div class="col-sm-4 form-group">
               <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
-                     v-scale="[model.f_privilege_money, 2]" placeholder="优惠金额" disabled>
+                     v-scale="[model.f_privilege_money, row.f_fee_decimal||4]" placeholder="优惠金额" disabled>
             </div>
             <div class="col-sm-4 form-group">
               <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
-                     v-scale="[model.f_after_discount, 2]" placeholder="优惠后收款" disabled>
+                     v-scale="[model.f_after_discount, row.f_fee_decimal||4]" placeholder="优惠后收款" disabled>
             </div>
           </div>
           <div class="row" v-if="model.f_payment[0].includes('POS')">
@@ -224,7 +224,7 @@
         if (self.row.f_alias === 'QiaoSong') {
           self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
         } else {
-          self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(self.row.f_gas_decimal || 4)
         }
         self.dymoney = 0
       } else {
@@ -245,11 +245,11 @@
     if (self.config.priceCalculation) {
       self.model.f_pregas = 0
     }
-    self.model.f_totalcost = ((self.row.f_balance - 0) > (self.model.f_preamount - 0) ? 0 : ((self.model.f_preamount - 0) - (self.row.f_balance - 0)).toFixed(4))
+    self.model.f_totalcost = ((self.row.f_balance - 0) > (self.model.f_preamount - 0) ? 0 : ((self.model.f_preamount - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
 
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
-    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(2)
+    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     if (self.config.floor) {
       self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
     }
@@ -265,7 +265,7 @@
   // 输入气量，换算金额
   let pregasGen = async function (self) {
     if (self.row.f_isdecimal === '是') {
-      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(self.row.f_gas_decimal || 4)
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
@@ -273,7 +273,7 @@
       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
-      self.model.f_totalcost = (self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(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
       if (self.config.floor) {

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

@@ -8,7 +8,7 @@
           <!--          </div>-->
           <div style="margin-top:10px;" v-for="(index, row) in model.otherdetail">
             <div class="row">
-              <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
+              <div class="col-sm-4" :class="{'select-error': row.f_brand_spec.length === 0 && config.checkFlag}">
                 <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">{{brandType}}</label>
                 <v-select id="f_brand_spec"
                           placeholder='请选择'
@@ -155,16 +155,16 @@
         <!-- <tax-other-bill :show="taxprint"  v-ref:taxprintbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></tax-other-bill> -->
         <div style="text-align:right;height: 25%;">
           <button v-if="config.modificationList" class="button_search" @click="confirm(true)"
-                  :disabled=' validflag || validateOk'>确认并转单
+                  :disabled=' validflag || validateOk || chargetypecheckflag'>确认并转单
           </button>
-          <payment-code-button :clickable=" validflag || validateOk"
+          <payment-code-button :clickable=" validflag || validateOk || chargetypecheckflag"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
           </payment-code-button>
           <button class="button_search btn-gn" v-if="authArr.includes('其它欠费生成')" @click="createQianfei()"
                   :disabled=' validflag || validateOk'>生成欠费
           </button>
-          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='validflag || validateOk'>确认
+          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='validflag || validateOk || chargetypecheckflag'>确认
           </button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
@@ -285,6 +285,7 @@ export default {
     return {
       config: {
         showupload: true,
+        // 验证收费类型是否必填
         checkFlag: false,
         modificationList: false,
         dispatch: false,
@@ -309,7 +310,7 @@ export default {
         t_userfees: '',
         f_fee_type: ['其他费用'],
         f_fee_time: ['12'],
-        otherdetail: [{f_brand_spec: [''],typeNameList:[],f_typenumber:'',typenumberList:[], f_unitprice: '', f_number: ''}]
+        otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: ''}]
       },
       eticket_msg: false,
       eticket_show: false,
@@ -372,7 +373,7 @@ export default {
       }
     },
     setTypeprice (val) {
-      console.log("单价变化：",val)
+      console.log('单价变化：', val)
       if (this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber[0]) {
         let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber[0])
         if (unitprice !== undefined) {
@@ -449,7 +450,7 @@ export default {
       this.eticket_show = false
       this.$dispatch('success')
     },
-    async setTypename (val,index) {
+    async setTypename (val, index) {
       this.model.otherdetail[index].f_typenumber = ''
       this.model.otherdetail[index].typeNameList = this.$appdata.getParam(val.f_brand_spec[0])
       this.model.otherdetail[index].typenumberList = []
@@ -470,7 +471,7 @@ export default {
         }
       }
     },
-    setTypenumber (val,index) {
+    setTypenumber (val, index) {
       this.model.otherdetail[index].typenumberList = this.$appdata.getParam(val.f_typename[0 ])
       this.model.otherdetail[index].f_unitprice = ''
     },
@@ -515,7 +516,7 @@ export default {
       if (!flag) this.model.f_collection = ''
     },
     addadetail () {
-      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [''],f_typenumber:'',typeNameList:[],typenumberList:[], f_unitprice: '', f_number: ''})
+      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [''], f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: ''})
       console.log(JSON.stringify(this.model.otherdetail))
     },
     delthisdetail (index) {
@@ -549,6 +550,18 @@ export default {
         return !this.$v.valid
       }
     },
+    // 验证收费类型是否必填
+    chargetypecheckflag () {
+      let b = false
+      if (this.config.checkFlag) {
+        this.model.otherdetail.forEach((item) => {
+          if (item.f_brand_spec && item.f_brand_spec.length === 0) {
+            b = true
+          }
+        })
+      }
+      return b
+    },
     feetime () {
       return [{label: '一个月', value: '1'}, {label: '三个月', value: '3'}, {label: '六个月', value: '6'}, {
         label: '一年',

package/src/components/revenue/cardHandManage/cardsHand.vue

@@ -221,6 +221,9 @@
               <th>
                 <nobr>表号</nobr>
               </th>
+              <th>
+                <nobr>用户电话</nobr>
+              </th>
               <th>
                 <nobr>抄表员</nobr>
               </th>
@@ -285,6 +288,7 @@
             <td>{{ row.f_user_level }}</td>
             <td style="text-align: center;">{{ row.f_residential_area }}</td>
             <td style="text-align: center;">{{ row.f_meternumber }}</td>
+            <td style="text-align: center;">{{ row.f_user_phone }}</td>
             <td style="text-align: center;">{{ row.f_inputtor }}</td>
             <td style="text-align: center;">{{ row.total_fee }}</td>
             <td style="text-align: center;">{{ row.total_gas }}</td>
@@ -460,6 +464,7 @@ export default {
         'f_userinfo_code': '客户编号',
         'f_user_name': '基本信息',
         'f_meternumber': '表号',
+        'f_user_phone': '用户电话',
         'f_inputtor': '抄表员',
         'total_fee': '总购金额',
         'total_gas': '累购气量',
@@ -599,14 +604,14 @@ export default {
       this.$refs.paged.$refs.criteria.search()
     },
     enter (row) {
-      if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0) {
+      if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(3) < 0) {
         return
       }
-      if (row.f_tablebase - parseInt(row.f_tablebase) !== 0) {
-        Vue.set(row, 'error', '底数只能输入整数')
+      if (row.f_tablebase.toString().split(".")[1].length>3) {
+        Vue.set(row, 'error', '底数最多只能输入小数点后3位')
         return
       }
-      // || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0
+      // || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(3) < 0
       if (row.f_tablebase) {
         // 如果本期底数大于上期底数生成超用收费
         // if ((row.f_tablebase - 0) > (row.f_meter_base - 0)) {
@@ -640,7 +645,7 @@ export default {
         row.f_total_gas = row.total_gas
         row.f_total_fee = row.total_fee
         // 余气量=累购-(本期指数-表初始指数)
-        row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+        row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(3)
         console.log('录入完毕。。', row)
         this.$resetpost('rs/logic/cardCommonEnter', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
           console.log('返回数据', res)

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -53,10 +53,10 @@
             </div>
           </div>
           <div class="row" style="margin-top:10px;">
-            <div  class="col-sm-4" :class="[$v.f_transfer_fees.dctest ? 'has-error' : 'has-success']">
+            <div  class="col-sm-4">
               <label id="label" for="f_transfer_fees" class="font_normal_body" title="单值管理：过户费">&nbsp;过&ensp;户&ensp;费</label>
               <input class="input_search" style="width:60%" type="number"  v-model="model.f_transfer_fees"  placeholder="过户费"
-                     v-next-el='accopen' v-el:fees v-validate:f_transfer_fees='{dctest: [0, ">=" ]}'>
+                     v-next-el='accopen' v-el:fees >
             </div>
             <div class="col-sm-4" :class="[$v.payment.required ? 'has-error' : '']">
               <label id="label" for="f_paymenttype" class="font_normal_body">&nbsp;付款方式</label>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -416,6 +416,7 @@ export default {
         payment: '现金缴费',
         open_way: '指令开户',
         hasArrearsChange: false, // 是否可以有欠费换表
+        isPraseInt: false,
         dispatch: false, // 是否派工
         showupload: true, //
         approve: false  // 是否开启审核
@@ -630,7 +631,8 @@ export default {
     async confirm () {
       let msg = ''
       if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
-        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
+        let isPraseInt = this.config.isPraseInt
+        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base)) || (isPraseInt && this.model.f_using_base_old > this.row.f_meter_base)) {
           msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
@@ -808,7 +810,8 @@ export default {
       }
       let msg = ''
       if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
-        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
+        let isPraseInt = this.config.isPraseInt
+        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base)) || (isPraseInt && this.model.f_using_base_old > this.row.f_meter_base)) {
           msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'

package/src/components/revenue/machineHandManage/ArrearsQuery.vue

@@ -191,9 +191,11 @@
                          condition="f_oughtfee_new > '{}'" placeholder="气费金额大于">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="欠费金额大于">欠费金额</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_all"
-                         condition="f_oughtfee_all > '{}'" placeholder="欠费金额大于">
+                  <label class="font_normal_body">欠费金额</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtfee_all_small"
+                         condition="f_oughtfee_all >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtfee_all_big"
+                         condition="f_oughtfee_all <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">欠费期数</label>

package/src/components/revenue/machineHandManage/machineHand.vue

@@ -287,6 +287,9 @@
               <th>
                 <nobr>表号</nobr>
               </th>
+              <th>
+                <nobr>用户电话</nobr>
+              </th>
               <th>
                 <nobr>上期底数</nobr>
               </th>
@@ -375,6 +378,7 @@
             <td style="text-align: center;">{{row.f_balance}}</td>
             <td style="text-align: center;">{{Math.round(row.avggas)}}</td>
             <td>{{row.f_meternumber}}</td>
+            <td>{{row.f_user_phone}}</td>
             <td>{{row.f_last_tablebase}}</td>
             <td id="hand-creat" v-if="row.f_meter_state === '未抄表' ">
               <div class="form-group" style="margin-bottom:0px;display: contents;" :class="{
@@ -382,7 +386,7 @@
                        'has-error has-feedback': row.error}"
               >
 
-                <input title="只能录入整数" type="text" class="input_search" v-model="row.f_tablebase"
+                <input title="可录入小数点后三位" type="text" class="input_search" v-model="row.f_tablebase"
                        @blur="$parent.$parent.$parent.beforenter($index, row)"
                        v-next-el="{id: $index+2}" :id="$index+1" style="width: 100px;padding: 6px;"
                        @focus="$parent.$parent.$parent.clearError(row)"
@@ -399,7 +403,7 @@
             <td style="text-align: center;">
               <div class="form-group" style="margin-bottom:0px;display: contents;" :class="{'has-success has-feedback': !row.error,'has-error has-feedback': row.error}"
                    v-if="row.f_meter_state === '未抄表' && row.states !== 0 && $parent.$parent.$parent.jurisdiction.includes('增量录入')">
-                <input title="只能录入整数" type="number" class="input_search" v-model="row.f_adjustment_volume"
+                <input title="底数最多只能输入小数点后3位" type="number" class="input_search" v-model="row.f_adjustment_volume"
                        style="width: 100px;padding: 6px;"
                        :disabled="row.state === '开始'">
               </div>
@@ -702,11 +706,11 @@
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">总用气量</label>
-              <p class="form-control" style="width:60%" disabled>{{ ((row.f_stair_gas1 - 0)+(row.f_stair_gas2 - 0)+(row.f_stair_gas3 - 0)).toFixed(2) }}</p>
+              <p class="form-control" style="width:60%" disabled>{{ ((row.f_stair_gas1 - 0)+(row.f_stair_gas2 - 0)+(row.f_stair_gas3 - 0)).toFixed(3) }}</p>
             </div>
             <div class="col-sm-4 form-group">
               <label class="font_normal_body">总用气金额</label>
-              <p class="form-control" style="width:60%" disabled>{{ row.f_oughtfee = ((row.f_stair_money1 - 0)+(row.f_stair_money2 - 0)+(row.f_stair_money3 - 0)).toFixed(2)  }}</p>
+              <p class="form-control" style="width:60%" disabled>{{ row.f_oughtfee = ((row.f_stair_money1 - 0)+(row.f_stair_money2 - 0)+(row.f_stair_money3 - 0)).toFixed(3)  }}</p>
             </div>
             <p style="color: red">注意: 自定义气量总量必须等于本次抄表用气量, 本次抄表总量: {{row.f_oughtamount}}</p>
           </div>
@@ -940,7 +944,7 @@
     },
     methods: {
       stairMoney (price, gas) {
-        return (price * gas).toFixed(2) - 0
+        return (price * gas).toFixed(3) - 0
       },
       async customPricingConfirm () {
         let sumGas = (this.row.f_stair_gas1 - 0) + (this.row.f_stair_gas2 - 0) + (this.row.f_stair_gas3 - 0)
@@ -997,12 +1001,12 @@
         let oughtamount = null
         if (row.f_tablebase) {
           if (row.f_share_gas) {
-            oughtamount = (row.f_tablebase - 0 - (row.f_last_tablebase - 0)).toFixed(4) + (row.f_share_gas > 0 ? '+' : '') + row.f_share_gas.toFixed(2)
+            oughtamount = (row.f_tablebase - 0 - (row.f_last_tablebase - 0)).toFixed(4) + (row.f_share_gas > 0 ? '+' : '') + row.f_share_gas.toFixed(3)
           } else {
             if (row.f_capacity && row.f_capacity > 0 && row.f_tablebase < row.f_last_tablebase) {
-              oughtamount = (row.f_tablebase - 0 + (row.f_capacity - row.f_last_tablebase)).toFixed(2)
+              oughtamount = (row.f_tablebase - 0 + (row.f_capacity - row.f_last_tablebase)).toFixed(3)
             } else {
-              oughtamount = (row.f_tablebase - 0 - (row.f_last_tablebase - 0)).toFixed(2)
+              oughtamount = (row.f_tablebase - 0 - (row.f_last_tablebase - 0)).toFixed(3)
             }
           }
         } else {
@@ -1105,8 +1109,8 @@
         if (this.danhu.f_tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
           return
-        } else if (this.danhu.f_tablebase - parseInt(this.danhu.f_tablebase) !== 0) {
-          this.$showAlert(`底数只能输入整数，请注意!`, 'warning', 2000)
+        } else if (this.danhu.f_tablebase.toString().split(".")[1].length>3) {
+          this.$showAlert(`底数最多只能输入小数点后3位，请注意!`, 'warning', 2000)
           return
         } else if (this.danhu.f_tablebase < this.danhu.info.f_tablebase && !this.danhu.info.f_capacity) {
           this.$showAlert(`本期表底数不能低于上期表底数`, 'warning', 2000)
@@ -1470,10 +1474,10 @@
             row.state = '失败'
             Vue.set(row, 'error', '底数不能小于0')
             this.speckText('底数不能小于0，请注意!')
-          } else if (row.f_tablebase - parseInt(row.f_tablebase) !== 0) {
+          } else if (row.f_tablebase.toString().split(".")[1].length>3) {
             row.state = '失败'
-            Vue.set(row, 'error', '底数只能输入整数')
-            this.speckText('底数只能输入整数，请注意!')
+            Vue.set(row, 'error', '底数最多只能输入小数点后3位')
+            this.speckText('底数最多只能输入小数点后3位，请注意!')
           } else if (row.f_tablebase < row.f_last_tablebase && !row.f_capacity) {
             row.state = '失败'
             Vue.set(row, 'error', '本期表底数不能低于上期表底数')
@@ -1810,7 +1814,7 @@
         if (this.row.f_price_type === '固定气价') {
           let price = this.$refs.mix_price.model.f_price
           // 可以购买的总气量
-          let purchaseSum = (money / price).toFixed(2)
+          let purchaseSum = (money / price).toFixed(3)
           // 计算应抄底数
           this.should_base = (this.row.f_last_tablebase - 0) + (purchaseSum - 0)
           // 计算公式
@@ -1822,7 +1826,7 @@
           // 把1阶买完的钱
           let price1 = surplus1 * mydata.f_stair1price
           // 剩余2阶气量
-          let surplus2 = (mydata.f_stair2ceiling - mydata.f_stair1ceiling - (mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0)).toFixed(2)
+          let surplus2 = (mydata.f_stair2ceiling - mydata.f_stair1ceiling - (mydata.f_hasuse2 > 0 ? mydata.f_hasuse2 : 0)).toFixed(3)
           // 把2阶买完的钱
           let price2 = surplus2 * mydata.f_stair2price
           // 兼容一下
@@ -1835,14 +1839,14 @@
           let purchase2 = 0
           let purchase3 = 0
           if (money <= price1) {
-            purchase1 = (money / mydata.f_stair1price).toFixed(2)
+            purchase1 = (money / mydata.f_stair1price).toFixed(3)
           } else if (money <= (price1 + price2)) {
             purchase1 = surplus1
-            purchase2 = ((money - price1) / mydata.f_stair2price).toFixed(2)
+            purchase2 = ((money - price1) / mydata.f_stair2price).toFixed(3)
           } else {
             purchase1 = surplus1
             purchase2 = surplus2
-            purchase3 = ((money - price1 - price2) / mydata.f_stair3price).toFixed(2)
+            purchase3 = ((money - price1 - price2) / mydata.f_stair3price).toFixed(3)
           }
           // 可以购买的总气量
           let purchaseSum = (purchase1 - 0) + (purchase2 - 0) + (purchase3 - 0)
@@ -1851,7 +1855,7 @@
           // 计算公式
           this.designFormulas = `${purchase1}X${mydata.f_stair1price} + ${purchase2}X${mydata.f_stair2price} + ${purchase3}X${mydata.f_stair3price}`
         }
-        this.should_base = this.should_base.toFixed(2) - 0
+        this.should_base = this.should_base.toFixed(3) - 0
       }
     },
     watch: {

package/src/filiale/baole/FilesManage/MeterinfoTest.vue

@@ -43,10 +43,6 @@
             <label for="f_metertitles" class="font_normal_body">表具状态</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_table_state" placeholder='表具状态' disabled>
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_meter_base" class="font_normal_body">报警器编号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_alarm_number" placeholder='报警器编号'>
-          </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'

package/src/filiale/haile/UserBaseInfoNew.vue

@@ -2,7 +2,7 @@
   <div class="auto">
   <div class="auto form-group-new row">
     <div class="col-sm-6" style="height:auto;width:49%;">
-      <p style="font-weight: bold;margin: 0"><img src="../../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;基本信息</p>
+      <p style="font-weight: bold;margin: 0"><img src="../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;基本信息</p>
       <!--    第一行数据-->
         <div class="col-sm-4">
           <label class="font_normal_body_new">客户编号</label>
@@ -58,7 +58,7 @@
         </div>
     </div>
     <div class="col-sm-6" style="height:auto;width:49%;">
-      <p style="font-weight: bold;margin: 0"><img src="../../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;表具信息</p>
+      <p style="font-weight: bold;margin: 0"><img src="../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;表具信息</p>
         <div class="col-sm-4">
           <label class="font_normal_body_new">表&emsp;号&emsp;</label>
           <input class="input-underline" style="width:60%" :value="row.f_meternumber" readonly>

package/src/plugins/FileManageService.js

@@ -120,8 +120,6 @@ let FileManageService = {
       meter.f_install_person = meter.f_install_person.length > 0 ? meter.f_install_person[0] : null
       meter.f_limit_sms = meter.f_limit_sms == '' ? meter.f_limit_sms = 30 : parseInt(meter.f_limit_sms)
       meter.f_card_id = meter.f_card_id ? meter.f_card_id : null
-      // 宝乐报警器编号
-      meter.f_alarm_number = meter.f_alarm_number ? meter.f_alarm_number : null
       // 安城表前阀状态
       meter.f_bqf_state = meter.f_bqf_state && meter.f_bqf_state.length > 0 ? meter.f_bqf_state[0] : null
      // meter.f_aroundmeter = meter.f_aroundmeter.length > 0 ? meter.f_aroundmeter[0] : null