sale-client 3.6.6 → 3.6.8

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['https://qnjtkf.cn:7400/', 'https://qnjtkf.cn:7400/']
+const [localUrl, serverRul] = ['http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -17,9 +17,6 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      '/rs/sql/filemanage_getUserfies': {
-        target: 'http://127.0.0.1:8080/'
-      },
       '/rs/file': {
         target: serverRul
       },

package/package.json

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

package/src/Util.js

@@ -361,5 +361,5 @@ export function nextMonth20 (date) {
 // export var f;
 // 去除多余的空格和回车
 export function removerUnnecessary (val) {
-  return val.trim().replace(/\s/g, '')
+  return val ? val.trim().replace(/\s/g, '') : val
 }

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

@@ -20,12 +20,14 @@
               <input class="input_search" style="width:60%" type="number" :disabled="config.calculatePreByCollection"
                      @blur="pregas()" v-model="model.f_pregas" v-el:fpregas
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
+                     v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
                      v-next-el='fcollection'>
             </div>
             <div class="col-sm-4" v-if="row.f_collection_type == '按金额'">
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" v-el:fpregas
                      @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
+                     v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
                      v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
             </div>
             <div class="col-sm-4"
@@ -34,6 +36,7 @@
               <input class="input_search" style="width:60%" type="number"
                      @blur="preamount()" v-model="model.f_preamount"
                      :disabled="config.calculatePreByCollection"
+                     v-scale="[model.f_preamount, row.f_fee_decimal||4 ]"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额">
             </div><!--
             <div class="col-sm-4" v-if="row.f_collection_type == '按气量'">
@@ -77,7 +80,7 @@
               <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='fcollection' v-scale="[model.f_totalcost, 4]" disabled>
+                     v-next-el='fcollection' v-scale="[model.f_totalcost, row.f_fee_decimal||4]" disabled>
             </div>
           </div>
           <div class="row">
@@ -244,9 +247,9 @@
 
     // 输入金额，换算气量
   let preamountGen = async function (self) {
-    let calFee = ((self.model.f_preamount - 0)).toFixed(4)
+    let calFee = ((self.model.f_preamount - 0)).toFixed(self.row.f_fee_decimal || 4)
     if (self.model.f_payment == '赠气') {
-      calFee = (self.model.f_preamount - 0).toFixed(4)
+      calFee = (self.model.f_preamount - 0).toFixed(self.row.f_fee_decimal || 4)
     }
       // 通过金额进行划价
     let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
@@ -255,19 +258,19 @@
         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)
         }
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
-          self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).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 {
           // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
         let tempnum = Math.floor(getGas.data.gas - 0)
-        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
-        self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
+        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(self.row.f_fee_decimal || 4))
+        self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
     }
@@ -280,24 +283,24 @@
       self.model.f_collection = 0
     } else {
       self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
-      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(4)
+      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     }
-    self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
+    self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     self.calText(getGas.data.chargeprice)
   }
 
   // 输入气量，换算金额
   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)
     }
     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
-      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_preamount = getAmount.data.chargenum.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
       if (self.model.f_payment == '赠气') {
@@ -649,7 +652,7 @@
     methods: {
       // 根据收款金额计算划价信息
       // 需要配置 calculatePreByCollection = true
-      async calculatePreByCollection() {
+      async calculatePreByCollection () {
         try {
           this.model.f_collection = (this.model.f_collection - 0)
           let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)

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

@@ -20,6 +20,7 @@
               <input class="input_search" style="width:60%" type="number" id="fouces"
                      @blur="pregas()" v-model="model.f_pregas" :disabled="config.calculatePreByCollection"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
+                     v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
                      v-next-el='sk'>
             </div>
 
@@ -29,7 +30,7 @@
               <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
                      @blur="preamount()" v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}'
                      placeholder="预购金额" :disabled="config.calculatePreByCollection"
-                     v-scale="[model.f_preamount, 4]" placeholder="预购金额">
+                     v-scale="[model.f_preamount, row.f_fee_decimal||4 ]" placeholder="预购金额">
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -67,7 +68,7 @@
               <input class="input_search" style="width:60%" type="number"
                      v-model="model.f_totalcost"
                      v-validate:f_totalcost='{required: true, dctest: [(openFee - 0), ">=" ] }' placeholder="应收金额"
-                     v-next-el='sk' v-scale="[model.f_totalcost, 4]" disabled>
+                     v-next-el='sk' v-scale="[model.f_totalcost, row.f_fee_decimal||4]" disabled>
             </div>
           </div>
 
@@ -273,52 +274,47 @@
  */
 
 import {HttpResetClass} from 'vue-client'
-import XML from '../../../plugins/ObjTree'
 
 let preamountGen = async function (self) {
-  let calFee = ((self.model.f_preamount - 0)).toFixed(4)
+  let calFee = ((self.model.f_preamount - 0)).toFixed(self.row.f_fee_decimal || 4)
   if (self.model.f_payment == '赠气') {
-    calFee = (self.model.f_preamount - 0).toFixed(4)
+    calFee = (self.model.f_preamount - 0).toFixed(self.row.f_fee_decimal || 4)
   }
   // 通过金额进行划价
   let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
   if (getGas.data.gas) {
     if (self.row.f_isdecimal === '是') {
-      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)
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
-        self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).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 {
       // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
       let tempnum = Math.floor(getGas.data.gas - 0)
-      let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+      let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(self.row.f_gas_decimal || 4))
       self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
       self.model.f_pregas = Math.floor(getGas.data.gas - 0)
     }
   }
-  self.model.f_totalcost = ((self.row.f_balance - 0) >= (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
+  self.model.f_totalcost = ((self.row.f_balance - 0) >= (calFee - 0) ? 0 : ((calFee - 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.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(2))
+  self.model.f_totalcost = ((self.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(self.row.f_fee_decimal || 4))
   self.model.f_collection = self.model.f_totalcost
   if (self.config.floor) {
     self.model.f_collection = Math.ceil(self.model.f_collection)
   }
-  self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
+  self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
   self.calText(getGas.data.chargeprice)
 }
 
 // 输入气量，换算金额
 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)
   }
@@ -326,7 +322,7 @@ let pregasGen = async function (self) {
     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
     self.model.f_collection = self.model.f_totalcost
@@ -465,7 +461,7 @@ let asyncShowCardSellGas = async function (self) {
 
 export default {
   title: '发卡售气',
-  data() {
+  data () {
     return {
       serialShow: false,
       resid: [],
@@ -537,8 +533,8 @@ export default {
     }
   },
   props: ['row'],
-  ready() {
-    console.log('==>' + this.$refs.valid)
+  ready () {
+    console.log(this.row)
     if (this.authArr.includes('余额写卡限定')) {
       this.paytype = [{label: '余额写卡', value: '余额写卡'}]
     } else {
@@ -577,20 +573,20 @@ export default {
   },
   events: {
     // 删除Resid数组元素
-    'delResid'(val) {
+    'delResid' (val) {
       this.resid.$remove({id: val, f_biobid: ''})
       // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
     },
     // 增加Resid数组元素
-    'resid'(val) {
+    'resid' (val) {
       this.resid.push({id: val, f_biobid: ''})
     }
   },
   watch: {
-    'row'(val) {
+    'row' (val) {
       this.model.f_balance = val.f_balance
     },
-    'model.f_payment.length'(val) {
+    'model.f_payment.length' (val) {
       console.log('付款方式多选。。', val)
       if (val > 3) {
         this.$showAlert('目前只支持三种支付方式', 'warning', 2000)
@@ -613,18 +609,18 @@ export default {
         this.getPrivilegeList()
       }
     },
-    'model.f_payment'(val) {
+    'model.f_payment' (val) {
       if (val == '免交') {
         this.mjshow = true
       } else {
         this.mjshow = false
       }
     },
-    'model.f_collection'(val) {
+    'model.f_collection' (val) {
       // 获取计算优惠
       this.getPrivilegeList()
     },
-    '$v'(val) {
+    '$v' (val) {
     },
     '$v': {
       handler: function (val) {
@@ -636,13 +632,13 @@ export default {
       },
       deep: true
     },
-    '$v.f_serial_number.valid'(val) {
+    '$v.f_serial_number.valid' (val) {
     }
   },
   methods: {
     // 根据收款金额计算划价信息
     // 需要配置 calculatePreByCollection = true
-    async calculatePreByCollection() {
+    async calculatePreByCollection () {
       try {
         this.model.f_collection = (this.model.f_collection - 0)
         let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
@@ -661,7 +657,7 @@ export default {
       }
     },
     // 校验发票信息
-    checkInvoiceMsg() {
+    checkInvoiceMsg () {
       console.log(this.model.f_print[0])
       if (this.model.f_print[0] === '电子发票') {
         if (!this.row.f_taxpayer_id) {
@@ -681,11 +677,11 @@ export default {
         this.confirm()
       }
     },
-    eticket_toggle() {
+    eticket_toggle () {
       this.eticket_show = false
       this.$dispatch('success')
     },
-    async confirm() {
+    async confirm () {
       this.eticket_msg = false
       if (this.$appdata.getSingleValue('开卡费')) {
         let sql = `select od.* from t_othercharge oc
@@ -732,11 +728,11 @@ export default {
         }
       })
     },
-    clean() {
+    clean () {
       this.$info('取消操作')
       this.$dispatch('refresh', this.row)
     },
-    pregas() {
+    pregas () {
       this.dymoney = 0
       if (this.model.f_pregas && this.model.f_pregas > 0) {
         try {
@@ -755,7 +751,7 @@ export default {
         this.model.f_pregas = 0
       }
     },
-    preamount() {
+    preamount () {
       this.dymoney = 0
       // if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
       // if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
@@ -770,11 +766,11 @@ export default {
       // }
     },
 
-    validateBill(val) {
+    validateBill (val) {
       this.validateOk = !val.isOk
       this.billData.bill = val.bill
     },
-    printok() {
+    printok () {
       // 收据打完，判断是否还有其他票据进行请求
       for (let i = 0; i < this.model.f_print.length; i++) {
         if (this.model.f_print[i] === '电子发票') {
@@ -783,7 +779,7 @@ export default {
       }
       this.$dispatch('success')
     },
-    calText(val) {
+    calText (val) {
       let str = ''
       let num = 0
       val.forEach((item) => {
@@ -806,13 +802,13 @@ export default {
         }
       }
     },
-    close() {
+    close () {
       this.showprint = false
       this.print = false
       this.clean()
     },
     // 根据选择的付款方式 获取优惠列表
-    async getPrivilegeList() {
+    async getPrivilegeList () {
       // 初始化下拉选择列表
       this.privilegeList = [{label: '无优惠', value: '0'}]
       // 初始为无优惠
@@ -838,7 +834,7 @@ export default {
       }
     },
     // 优惠计算
-    async privilegeCalculate() {
+    async privilegeCalculate () {
       // 初始化减免金额
       this.model.f_privilege_money = 0
       this.model.f_after_discount = this.model.f_collection
@@ -879,13 +875,13 @@ export default {
     }
   },
   computed: {
-    'invoice_show_gas'() {
+    'invoice_show_gas' () {
       return this.row.f_collection_type === '按气量' ? '是' : '否'
     },
-    authArr() {
+    authArr () {
       return this.$login.r ? this.$login.r : []
     },
-    'curbalance'() {
+    'curbalance' () {
       if (this.model.f_payment === '赠气') {
         return this.model.f_balance
       }
@@ -902,7 +898,7 @@ export default {
         return this.row.f_balance
       }
     },
-    'islegal'() {
+    'islegal' () {
       if (this.paymentModel.length > 1 && this.model.f_collection) {
         let sum = 0
         this.paymentModel.forEach((res) => {

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -2,7 +2,7 @@
   <div class="basic-main" style="height: 98%">
     <div class="flex">
     <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div
@@ -176,7 +176,8 @@
     data () {
       return {
         resid: [],  // 存放新增的f_files表中id
-        criteriaShow:false,
+        criteriaShow: false,
+        f_orgid: this.$login.f.orgid,
         curorgid: [this.$login.f.orgid],
         model: new PagedList('rs/sql/bankPayment', 20, {bankname: 'this.model.f_bank_name[0]', startDate: 'this.model.startDate', endDate: 'this.model.endDate', orderitem: '"delivery_date DESC "'}, {f_collection: '', f_total_charge: ''}),
         bodydata: ['f_userinfo_code', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
@@ -186,6 +187,8 @@
     },
     props: [],
     ready () {
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
     },
     methods: {
       search () {
@@ -195,6 +198,13 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
+        debugger
+        if (!this.$refs.paged.$refs.cri.model.startDate) {
+          this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString()
+        }
+        if (!this.$refs.paged.$refs.cri.model.endDate) {
+          this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
+        }
         console.log('查询。。。', this.f_orgid)
         if (this.f_orgid) {
           args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
@@ -221,26 +231,26 @@
       },
       // 微信单方账单，系统可缴费
       async charge (row) {
-          row.f_operator=Vue.$login.f.name,
-          row.f_operatorid= Vue.$login.f.id,
-          row.f_orgid= Vue.$login.f.orgid,
-          row.f_orgname= Vue.$login.f.orgs,
-          row.f_depid= Vue.$login.f.depids,
-          row. f_depname= Vue.$login.f.deps,
-          row. f_zoneid= Vue.$login.f.zoneid,
-          row. f_zones= Vue.$login.f.zones
-            let res = await this.$resetpost('rs/logic/cardOneBank',row,{resolveMsg:'缴费成功',rejectMsg:'缴费失败'})
-          let param = []
-          for (let row of this.resid) {
-            param.push({id: row.id})
-          }
-          let data = {
-            param: param,
-            f_blobid: res.data
-          }
+        row.f_operator = Vue.$login.f.name,
+          row.f_operatorid = Vue.$login.f.id,
+          row.f_orgid = Vue.$login.f.orgid,
+          row.f_orgname = Vue.$login.f.orgs,
+          row.f_depid = Vue.$login.f.depids,
+          row.f_depname = Vue.$login.f.deps,
+          row.f_zoneid = Vue.$login.f.zoneid,
+          row.f_zones = Vue.$login.f.zones
+        let res = await this.$resetpost('rs/logic/cardOneBank', row, {resolveMsg: '缴费成功', rejectMsg: '缴费失败'})
+        let param = []
+        for (let row of this.resid) {
+          param.push({id: row.id})
+        }
+        let data = {
+          param: param,
+          f_blobid: res.data
+        }
 
-          await this.$resetpost('rs/logic/updatefiles', data)
-          this.$refs.paged.$refs.cri.search()
+        await this.$resetpost('rs/logic/updatefiles', data)
+        this.$refs.paged.$refs.cri.search()
       }
         // })
     },

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -41,6 +41,24 @@
                       :options='isdecimal' placeholder='是否支持小数'
                       close-on-select style="width: 60%"></v-select>
           </div>
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_isdecimal[0] ==='是'">
+            <label for="f_isdecimal" class="font_normal_body">气量位数</label>
+              <v-select :value.sync="gasmessage.f_gas_decimal"
+                      v-model="gasmessage.f_gas_decimal"
+                      :value-single="true"
+                      :search="false"
+                      :options='decimalArray' placeholder='气量位数'
+                      close-on-select style="width: 60%"></v-select>
+          </div>
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_isdecimal[0] ==='是'">
+            <label for="f_isdecimal" class="font_normal_body">金额位数</label>
+            <v-select :value.sync="gasmessage.f_fee_decimal"
+                      v-model="gasmessage.f_fee_decimal"
+                      :value-single="true"
+                      :search="false"
+                      :options='decimalArray' placeholder='金额位数'
+                      close-on-select style="width: 60%"></v-select>
+          </div>
           <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('物联网')" :class="[$v.calculation.required ? 'select-error' : '']">
             <label for="f_calculation" class="font_normal_body">结算方式</label>
             <input type="text" v-show="false" v-model="$refs.calculation.selectedItems" v-validate:calculation='{required: true }'>
@@ -172,6 +190,8 @@ export default {
         id: '',
         f_meter_type: '',
         f_isdecimal: [],
+        f_gas_decimal: 4,
+        f_fee_decimal: 4,
         f_meter_brand: '',
         f_alias: '',
         f_calculation: '',
@@ -198,6 +218,7 @@ export default {
       ischeck: [{label: '否', value: '否'}, {label: '是', value: '是'}],
       isstep: [{label: '否', value: '否'}, {label: '是', value: '是'}],
       isdecimal: [{label: '否', value: '否'}, {label: '是', value: '是'}],
+      decimalArray: [{label: 1, value: 1}, {label: 2, value: 2}, {label: 3, value: 3}, {label: 4, value: 4}],
       collectiontypes: [{label: '按金额', value: '按金额'}, {label: '按气量', value: '按气量'}],
       meterType: [{label: '金额卡表', value: '金额卡表'}, {label: '气量卡表', value: '气量卡表'}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
       calculation: [{label: '表端结算', value: '表端结算'}, {label: '系统结算', value: '系统结算'}]
@@ -373,6 +394,8 @@ export default {
         f_police_gas: '',
         f_overdr_lines: '',
         f_share_times: '',
+        f_gas_decimal: 4,
+        f_fee_decimal: 4,
         f_is_check: [],
         f_is_step: []
       }

package/src/components/webMeter/paramSave/ParamSetForm.vue

@@ -118,6 +118,7 @@
 
 <script>
   import {HttpResetClass} from 'vue-client'
+  import axios from "axios";
 
 export default {
     title: '参数设置',
@@ -282,8 +283,8 @@ export default {
           this.gasbrand = res.data[0]
         })
         this.newmeterinfo = [{}]
-
-        let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: '参数已加载', rejectMsg: null})
+        let res = await axios.post('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {timeout: 10 * 60 * 1000})
+        // let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: '参数已加载', rejectMsg: null})
         this.newmeterinfo = res.data
         for (let i = 0; i < this.newmeterinfo.length; i++) {
           this.paramtypes.push({label: this.newmeterinfo[i].name, value: this.newmeterinfo[i].name})