sale-client 3.5.203 → 3.5.205

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -281,7 +281,7 @@
                     class="form-group">
                     <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
                     <input class="input_search" condition="f_meternumber ='{}'" placeholder='表号' style="width:60%"
-                           type="text" v-model="model.f_meternumber">
+                           type="text" v-model.trim="model.f_meternumber">
                   </div>
                 </div>
               </div>

package/src/components/FilesManage/MeterinfoTest.vue

@@ -24,13 +24,13 @@
 
           <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
+            <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
                    @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
                    v-next-el="{id: 'metertitles'}">
           </div>
           <div class="col-sm-4 form-group" v-else>
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
+            <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
                    @blur="meternumberValidate()" placeholder='表号'
                    v-next-el="{id: 'metertitles'}">
           </div>

package/src/components/FilesManage/UserFireInfo.vue

@@ -26,7 +26,7 @@
               </div>
               <div class="col-sm-3 form-group" >
                 <label class="font_normal_body">&emsp;&emsp;&emsp;表&emsp;&emsp;号</label>
-                <input type="text" class="input-underline" style="width:60%" v-model="meter.f_meternumber" readonly
+                <input type="text" class="input-underline" style="width:60%" v-model.trim="meter.f_meternumber" readonly
                        placeholder='表号' >
               </div>
               <div class="col-sm-3 form-group" >

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -5,7 +5,7 @@
         <div class="row">
           <div class="col-sm-4 form-group" :class="[$m.meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
+            <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
                    @blur="meternumberValidate()" placeholder='表号'
                    v-next-el="{id: 'metertitles'}">
           </div>

package/src/components/UserFiles/Meterinfo.vue

@@ -8,7 +8,7 @@
         <div class="row auto">
           <div class="col-sm-3" :class="[$m.meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
+            <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
                    v-validate:meternumber='{required: true }' @blur="meternumberValidate()" placeholder='表号'
                    v-next-el="{id: 'metertitles'}">
           </div>

package/src/components/UserFiles/UserGeneralInfo.vue

@@ -68,7 +68,8 @@
               f_user_state: '',
               f_credentials: '',
               f_cost_type: '',
-              f_paper_type: ''
+              f_paper_type: '',
+              f_contract_id: ''
             },
             bank: {
               f_bank_name: ''
@@ -249,7 +250,7 @@
           row.f_devices_type = row.f_devices_type ? [row.f_devices_type] : ''
         })
       },
-      getPricenames (f_user_type, f_gasproperties, f_price_type) {
+      getPricenames(f_user_type, f_gasproperties, f_price_type){
         let rs = []
         if (f_user_type.length === 1 && f_gasproperties.length === 1 && f_price_type.length === 1) {
           rs = this.$GetSaleParam.getPrice({

package/src/components/UserFiles/UserPriceChangeManage.vue

@@ -42,7 +42,7 @@
                   </div>
                   <div class="form-group col-sm-2">
                     <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                    <input type="text" class="input_search" style="width:60%" v-model.trim="model.f_meternumber" placeholder='表号'
                            condition="f_meternumber = '{}'">
                   </div>
                   <div class="form-group col-sm-2">

package/src/components/charge/ChargeList.vue

@@ -44,7 +44,7 @@
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">表&emsp;&emsp;号</label>
-                <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                <input type="text" class="input_search" style="width:60%" style="width:60%" v-model.trim="model.f_meternumber" placeholder='表号'
                        condition="u.f_meternumber like '%{}%'">
               </div>
 

package/src/components/charge/business/refund_copy/IOTRefund.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
+            <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+             <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
+              <v-select v-model="f_payment"
+                        placeholder='请选择'
+                        style="width:60%"
+                        :value.sync="model.f_payment"
+                        :options='paytype'
+                        v-ref:payment
+                        close-on-select clear-button></v-select>
+
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+
+              <v-select id="print"
+                        v-model="f_print"
+                        style="width:60%"
+                        placeholder='请选择'
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">剩余气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_gas" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">核算单价</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_price" >
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按金额'">
+            <label class="font_normal_body">剩余金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_amount" readonly>
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [0, ">=" ]}' placeholder="冲减气量" >
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按气量'"
+               :class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">冲减气量</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
+                   v-validate:f_refund_gas='{required: true,  dctest: [data.f_balance_gas, "<=" ]}' placeholder="冲减气量" >
+          </div>
+        </div>
+
+        <div class="row">
+
+          <div class="col-sm-8">
+            <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+            <input class="input_search" style="width:80%"  v-model="model.f_comments">
+          </div>
+          <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%"
+                   type="number" v-model="model.f_refund_fee"
+                    placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance_amount, "<=" ]}' placeholder="退费金额">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按金额'"
+               :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">退费金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                   v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+        <button class="button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
+  </div>
+
+  <upload :blodid="data.f_userinfo_id"  isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+  let readyGen = async function (self) {
+    await self.$getConfig(self, 'IOTRefund')
+    // 默认打印格式
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+
+    self.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.hasValidateBill = self.config.hasBillManage
+  }
+
+  export default {
+    title: '物联网表退费',
+    data () {
+      return {
+        config: {
+          showupload: false, // 默认不上传附件
+          hasPrint: false,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          overBalance: false,   //为true时退费金额可以大于余额
+          printType: '普通收据', // 收据/电子票/专用发票/国税发票
+          payment: '现金缴费',
+          billType: '燃气费'
+        },
+        model: {
+          f_refund_fee: '',
+          f_refund_gas: '',
+          f_comments: '',
+          f_payment: '',
+          f_print: '',
+          f_price: 0
+        },
+
+        blodid: '',
+        hasValidateBill: false,
+        validateOk: false,
+
+        printModel: {},
+        print: false,
+        billUrl: '',
+        billData: {
+          url: 'rs/report/refund_sell',
+          bill: ''
+        },
+
+        // 下拉框值
+        paytype: this.$appdata.getParam('付款方式'),
+        printstyle: this.$appdata.getParam('打印格式')
+      }
+    },
+    props: ['data'],
+    ready () {
+      readyGen(this)
+      if (this.data.f_collection_type === '按气量') {
+        // this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
+        this.model.f_price = this.data.f_price
+
+        // this.$dispatch('refresh')
+      }
+    },
+    methods: {
+        async confirm () {
+        let param = {
+          f_user_id: this.data.f_user_id,
+          f_userfiles_id: this.data.f_userfiles_id,
+          version: this.data.version,
+          f_price: this.model.f_price,
+          f_refund_gas: this.model.f_refund_gas,
+          f_refund_fee: this.model.f_refund_fee,
+          f_comments: this.model.f_comments,
+          f_collection_type: this.data.f_collection_type,
+          f_payment: this.model.f_payment[0],
+          f_print: this.model.f_print[0],
+          f_price_id: this.data.f_price_id,
+          f_total_gas: parseFloat(this.data.f_total_gas) - parseFloat(this.model.f_refund_gas),
+          f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
+          f_stairprice_id: this.data.f_stairprice_id,
+          operInfo: {
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps
+          }
+        }
+        console.log('退费传参', param)
+        let res = await this.$resetpost('rs/logic/iotRefund_Copy', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+        console.log('退费', res)
+        console.log('退费this.config', this.config)
+        console.log('退费this.model', this.model)
+        if (this.config.hasPrint) {
+          if (this.model.f_print.indexOf('电子发票') == -1) {
+            console.log('this.config.hasBillManage', this.config.hasBillManage)
+            if (this.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              this.printModel.id = res.data.id
+              this.printModel.f_bill_type = '退费'
+              this.printModel.f_bill_style = this.model.f_print[0]
+              // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            } else {
+              this.printModel.id = res.data.id
+              // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            }
+          } else if (this.config.printType === '国税发票') {
+            // TODO
+            this.$dispatch('success')
+          } else if (this.config.printType === '电子发票') {
+            // TODO
+            this.$dispatch('success')
+          }
+        }else{
+          this.$dispatch('success')
+        }
+      },
+      refundChange () {
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      },
+      clean () {
+        this.$dispatch('refresh')
+      },
+      printok () {
+        this.$dispatch('success')
+      },
+      validateBill (val) {
+        this.validateOk = !val.isOk
+        this.billData.bill = val.bill
+      }
+    },
+    watch:{
+      'model.f_price'(){
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      },
+      'model.f_refund_gas'(){
+        this.model.f_refund_fee = (this.model.f_refund_gas - 0) * (this.model.f_price - 0)
+      }
+    }
+  }
+</script>

package/src/components/charge/business/refund_copy/RefundManage.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="auto">
+    <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund>
+    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-Refund>
+  </div>
+
+</template>
+<script>
+  import IotRefund from './IOTRefund'
+  import machineRefund from './machineRefund'
+
+  export default {
+    title: '退费管理',
+    components: {
+      IotRefund,
+      machineRefund
+    },
+    data () {
+      return {
+
+      }
+    },
+    ready () {
+
+    },
+    props: ['row']
+  }
+</script>

package/src/components/charge/business/refund_copy/machineRefund.vue

@@ -0,0 +1,193 @@
+<template>
+    <div class="auto">
+        <validator name='v'>
+            <form novalidate class="form-horizontal">
+                <div class="row">
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+
+                        <v-select v-model="f_payment"
+                                  placeholder='请选择'
+                                  style="width:60%"
+                                  :value.sync="model.f_payment"
+                                  :options='paytype'
+                                  close-on-select clear-button></v-select>
+
+                    </div>
+                    <div class="col-sm-4 form-group">
+                        <label for="f_print" class="font_normal_body">打印格式</label>
+
+                        <v-select id="print"
+                                  v-model="f_print"
+                                  style="width:60%"
+                                  placeholder='请选择'
+                                  :value.sync="model.f_print"
+                                  :options='printstyle'
+                                  close-on-select clear-button>
+                        </v-select>
+                    </div>
+
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body">剩余金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
+                    </div>
+                </div>
+
+                <div class="row">
+
+
+                    <div class="col-sm-8">
+                        <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+                        <input class="input_search" style="width:80%"  v-model="model.f_comments">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="!config.overBalance"
+                         :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">退费金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                               v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance, "<=" ]}' placeholder="退费金额">
+                    </div>
+                  <div class="col-sm-4 form-group" v-if="config.overBalance"
+                       :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+                    <label class="font_normal_body">退费金额</label>
+                    <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                           v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+                  </div>
+                </div>
+            </form>
+            <div style="text-align:right;">
+                <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+                <button class="button_clear btn-gn" @click="clean()">取消</button>
+            </div>
+        </validator>
+        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+        <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+        <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
+    </div>
+
+    <upload :blodid="data.f_userinfo_id"  isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+    let readyGen = async function (self) {
+      await self.$getConfig(self, 'MachineTRefund')
+      console.log('机表退费config', self.config)
+        // 默认打印格式
+      self.blodid = self.data.f_userinfo_id
+      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+      self.model.f_payment = [self.config.payment]
+
+      self.model.f_use_type = self.config.billType
+      self.model.f_bill_type = self.model.f_print
+      self.hasValidateBill = self.config.hasBillManage
+    }
+
+    export default {
+      title: '机表退费',
+      data () {
+        return {
+          config: {
+            showupload: false, // 默认不上传附件
+            hasPrint: false,  // 默认打票
+            hasBillManage: false,  // 默认不启用发票管理
+            overBalance: false,   //为true时退费金额可以大于余额
+            printType: '普通收据', // 收据/电子票/专用发票/国税发票
+            payment: '现金缴费',
+            billType: '燃气费'
+          },
+          model: {
+            f_refund_fee: '',
+            f_comments: '',
+            f_payment: '',
+            f_print: ''
+          },
+
+          blodid: '',
+          hasValidateBill: false,
+          validateOk: false,
+
+          printModel: {},
+          print: false,
+          billUrl: '',
+          billData: {
+            url: 'rs/report/refund_sell',
+            bill: ''
+          },
+
+                // 下拉框值
+          paytype: this.$appdata.getParam('付款方式'),
+          printstyle: this.$appdata.getParam('打印格式')
+        }
+      },
+      props: ['data'],
+      ready () {
+            /* if (this.data.f_billing === '按气量') {
+                this.$showAlert('按气量缴费的机表退费功能尚未开放！！', 'warning', 3000)
+                this.$dispatch('refresh')
+            } else { */
+        readyGen(this)
+           /* } */
+      },
+      methods: {
+        async confirm () {
+          let param = {
+            f_user_id: this.data.f_user_id,
+            f_userfiles_id: this.data.f_userfiles_id,
+            version: this.data.version,
+            f_refund_fee: this.model.f_refund_fee,
+            f_comments: this.model.f_comments,
+            f_payment: this.model.f_payment[0],
+            f_print: this.model.f_print[0],
+            f_price_id: this.data.f_price_id,
+
+            f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
+            f_stairprice_id: this.data.f_stairprice_id,
+            operInfo: {
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_orgid: this.$login.f.orgid,
+              f_orgname: this.$login.f.orgs,
+              f_depid: this.$login.f.depids,
+              f_depname: this.$login.f.deps
+            }
+          }
+
+          let res = await this.$resetpost('rs/logic/machineRefund_Copy', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+
+          if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
+            console.log('this.config.hasBillManage', this.config.hasBillManage)
+            if (this.config.hasBillManage) {
+                        // 启用发票管理，获取票据管理中的票号并存储记录
+              this.printModel.id = res.data.id
+              this.printModel.f_bill_type = '退费'
+              this.printModel.f_bill_style = this.model.f_print[0]
+                        // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            } else {
+              this.printModel.id = res.data.id
+                        // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            }
+          } else if (this.config.printType === '国税发票') {
+                    // TODO
+            this.$dispatch('success')
+          } else if (this.config.printType === '电子发票') {
+                    // TODO
+            this.$dispatch('success')
+          } else {
+            this.$dispatch('success')
+          }
+        },
+        clean () {
+          this.$dispatch('refresh')
+        },
+        printok () {
+          this.$dispatch('success')
+        },
+        validateBill (val) {
+          this.validateOk = !val.isOk
+          this.billData.bill = val.bill
+        }
+      }
+    }
+</script>

package/src/components/chargeBatch/ChargeBatchList.vue

@@ -43,7 +43,7 @@
               <div class="form-group col-sm-4">
                 <label class="font_normal_body">表&emsp;&emsp;号</label>
                 <input type="text" class="input_search" style="width:60%" style="width:60%"
-                       v-model="model.f_meternumber" placeholder='表号'
+                       v-model.trim="model.f_meternumber" placeholder='表号'
                        condition="f_meternumber like '%{}%'">
               </div>
 

package/src/components/priceadjustment/adjustUser.vue

@@ -36,7 +36,7 @@
                 </div>
                 <div class="form-group col-sm-3">
                   <label class="font_normal_body">表&emsp;&emsp;号</label>
-                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model.trim="model.f_meternumber" placeholder='表号'
                          condition="f_meternumber like '%{}%'">
                 </div>
                 <div class="form-group col-sm-3">

package/src/components/revenue/HandManager/HandManager.vue

@@ -79,7 +79,7 @@
               </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">表&emsp;&emsp;号</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
                        condition="f_meternumber like '%{}%'" placeholder='表号'>
               </div>
               <div class="col-sm-2 form-group">

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

@@ -85,14 +85,13 @@
                         close-on-select style="width: 60%"></v-select>
 
           </div>
-          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('卡表')">
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('卡表')||gasmessage.f_meter_type[0].includes('物联网表')">
             <label for="hasCard" class="font_normal_body">支持累购</label>
             <v-select :value.sync="gasmessage.f_support_purchase"
                       :value-single="true"
                       v-model="gasmessage.f_support_purchase"
                       :options='isdecimal' placeholder='是否支持累购'
                       close-on-select style="width: 60%"></v-select>
-
           </div>
           <div v-if="gasmessage.f_meter_type[0].includes('卡表') || gasmessage.f_hascard[0]==='是'" class="row">
             <div class="col-sm-4 form-group" :class="[$v.f_cardnumber.required ? 'has-error' : 'has-success']">

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

@@ -89,7 +89,7 @@
               </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">表&emsp;&emsp;号</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
                        condition="f_meternumber like '%{}%'" placeholder='表号'>
               </div>
               <div class="col-sm-2 form-group">

package/src/filiale/fugu/MeterinfoTest.vue

@@ -8,13 +8,13 @@
         <div class="row">
           <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
+            <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
                    @blur="meternumberValidate()" placeholder='表号' v-validate:f_meternumber='{required: true }'
                    v-next-el="{id: 'metertitles'}">
           </div>
           <div class="col-sm-4 form-group" v-else>
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
+            <input type="text" class="input_search" style="width:60%" v-model.trim="row.f_meternumber"
                    @blur="meternumberValidate()" placeholder='表号'
                    v-next-el="{id: 'metertitles'}">
           </div>