sale-client 4.2.121 → 4.2.122

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Dec 23 15:55:46 CST 2025
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -51,10 +51,10 @@ var devConfig = {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
-        // pathRewrite: {
-        //   '/api/af-revenue': '/af-revenue'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue': '/af-revenue'
+        },
+        target: "http://localhost:8080"
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/filiale/dexin/ChangeMeter.vue

@@ -0,0 +1,1163 @@
+<template>
+  <div class="auto" style="overflow:auto;" id="ChangeMeter">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row auto">
+          <div class="col-sm-4 form-group">
+            <label for="f_type" class=" font_normal_body">换表类型</label>
+            <v-select id="f_type"
+                      v-model="model.f_type"
+                      title="参数:换表类型"
+                      placeholder='请选择'
+                      :value-single="true"
+                      :value.sync="model.f_type"
+                      :options='replacewatchtype'
+                      @change="typeChange"
+                      :disabled="!(row.f_meter_type.includes('卡表')||row.f_meter_type ==='物联网表')"
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group" v-if="!config.f_change_operator">
+            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   placeholder="换表人">
+          </div>
+          <div class="col-sm-4 form-group" v-if="config.f_change_operator" :class="[$v.f_change_operator.required ? 'has-error' : '']">
+            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   v-validate:f_change_operator="{required: true }"
+                   placeholder="换表人">
+          </div>
+
+          <div class="col-sm-4 form-group"
+               :class="[$v.f_using_base_old.required || $v.f_using_base_old.dctest ? 'has-error' : 'has-success']">
+            <label for="f_remanent_gas" class=" font_normal_body">旧表底数</label>
+            <input class="input_search" style="width:60%" type="number"
+                   v-model="model.f_using_base_old"
+                   placeholder="请输入旧表底数"
+                   v-validate:f_using_base_old='{required: true, dctest: [-1, ">" ] }'
+                   @blur="pregasChange()">
+          </div>
+        </div>
+        <!--<p class="bg-info text-center" v-if="!model.f_type.includes('清零')" style="padding: 8px;">新表信息</p>-->
+        <meter-message v-if="!model.f_type.includes('清零') && !model.f_type.includes('换卡控流量计')"
+                       :f_userfiles_id="row.f_userfiles_id" :metermessage.sync="model.metermessage"
+                       @valid="meterinfo = true"
+                       @invalid="meterinfo = false" @gasmodel="gasModelChange" v-ref:metermsg></meter-message>
+
+        <div v-if="row.f_meter_type != '机表'">
+          <div class="row auto" style="margin-top: 10px"
+               v-if="changeType == 'gasToAmount' || changeType == 'amountToGas'">
+            <!-- 气量转金额 || 金额转签气量 -->
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_remanent_gas.required || $v.f_remanent_gas.dctest ? 'has-error' : 'has-success']">
+              <label for="f_remanent_gas" class=" font_normal_body">补&ensp;气&ensp;量</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_remanent_gas"
+                     placeholder="补气量"
+                     v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
+            </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="model.f_remanent_price"
+                     placeholder="补气单价" readonly>
+            </div>
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_remanent_money.required || $v.f_remanent_money.dctest ? 'has-error' : 'has-success']">
+              <label for="f_remanent_money" class=" font_normal_body">补气金额</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_remanent_money"
+                     placeholder="补气金额"
+                     @blur="remanentChange"
+                     v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
+            </div>
+          </div>
+          <div class="row auto" v-if="changeType == 'gasToGas'">
+            <!-- 气量转气量 -->
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_remanent_gas.required || $v.f_remanent_gas.dctest ? 'has-error' : 'has-success']">
+              <label for="f_remanent_gas" class=" font_normal_body">补&ensp;气&ensp;量</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_remanent_gas"
+                     placeholder="补气量"
+                     v-validate:f_remanent_gas='{required: true, dctest: [-1, ">" ] }'>
+            </div>
+          </div>
+
+          <div class="row auto" v-if="changeType == 'amountToAmount'">
+            <!-- 金额转金额 -->
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_remanent_money.required || $v.f_remanent_money.dctest ? 'has-error' : 'has-success']">
+              <label for="f_remanent_money" class=" font_normal_body">补气金额</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_remanent_money"
+                     placeholder="补气金额"
+                     v-validate:f_remanent_money='{required: true, dctest: [-1, ">" ] }'>
+            </div>
+          </div>
+        </div>
+
+        <div class="row auto" v-if="model.f_type.includes('换卡控流量计')">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计表号">新流量计表号</label>
+            <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_number"
+                   placeholder='流量计表号'></input>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计通经">新流量计通经</label>
+            <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_pass"
+                   placeholder='流量计通经'></input>
+          </div>
+          <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
+            <label class="font_normal_body">新表底数</label>
+            <input type="number" class="input_search" style="width:60%" v-validate:f_meter_base='{required: true }'
+                   v-model="model.metermessage.f_meter_base" placeholder='表底数'>
+          </div>
+
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计品牌">新流量计品牌</label>
+            <v-select :value.sync="model.f_flowmeter_brand" :options='flowmeterbrands' value-single placeholder='流量计品牌'
+                      close-on-select
+                      search v-model='model.f_flowmeter_brand'></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计型号">新流量计型号</label>
+            <v-select :value.sync="model.f_flowmeter_model" :options='flowmetermodels(model.f_flowmeter_brand)'
+                      value-single placeholder='流量计型号' close-on-select
+                      v-model='model.f_flowmeter_model' :disabled='model.f_flowmeter_brand.length === 0'></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计精准度">新流量计精准度</label>
+            <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_accuracy"
+                   placeholder='流量计精准度'></input>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计压力等级">新流量计压力等级</label>
+            <input type="text" class="input_search" style="width:60%" v-model="model.f_flowmeter_mpa_level"
+                   placeholder='流量计压力等级'></input>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="流量计安装日期">新流量计安装日期</label>
+            <datepicker style="width:60%" placeholder="流量计安装日期"
+                        v-model="model.f_flowmeter_install_date"
+                        :value.sync="model.f_flowmeter_install_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+            ></datepicker>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">业务单号</label>
+            <input class="input_search" style="width:60%" type="text"
+                   v-model="model.f_serial_number" placeholder="业务单号">
+          </div>
+        </div>
+
+
+        <div class="row auto">
+
+          <div class="col-sm-4 form-group">
+            <label for="f_changemeter_fee" class=" font_normal_body">换表金额</label>
+            <input class="input_search" style="width:60%" type="number" v-model="model.f_changemeter_fee"
+                   placeholder="换表金额">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+            <v-select id="f_payment"
+                      title="参数:付款方式"
+                      v-model="f_payment"
+                      placeholder='请选择'
+                      :value-single="true"
+                      :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"
+                      title="参数:打印格式"
+                      v-model="f_print"
+                      placeholder='请选择'
+                      :multiple="mulPrint"
+                      :value.sync="model.f_print"
+                      :options='printstyle'
+                      close-on-select clear-button></v-select>
+          </div>
+        </div>
+        <div class="row" v-if="!model.f_type.includes('换卡控流量计')">
+          <div class="col-sm-4 form-group" :class="[$m.type.required ? 'has-error' : '']">
+            <label class="font_normal_body">气价类型</label>
+            <v-select :value.sync="newinfo.pricetype" v-model="newinfo.pricetype"
+                      placeholder='气价类型' :options="pricetypes"
+                      close-on-select v-ref:type>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
+            <label class="font_normal_body">气价名称</label>
+            <v-select :value.sync="newinfo.pricename" v-model="newinfo.pricename"
+                      placeholder='气价名称' :options="getPricenames()"
+                      close-on-select :disabled='newinfo.pricetype.length === 0 ' v-ref:name></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">新抄表册</label>
+            <v-select :value.sync="newinfo.f_meter_book" v-model="newinfo.f_meter_book"
+                      placeholder='新抄表册' :options="meterbookoptions"
+                      close-on-select></v-select>
+          </div>
+
+        </div>
+        <div class="row auto" v-if="!model.f_type.includes('换卡控流量计')">
+          <div class="col-sm-4 ">
+            <label for="f_comments" class=" font_normal_body">业务单号</label>
+            <input class="input_search" style="width:60%" type="text"
+                   v-model="model.f_serial_number" placeholder="业务单号">
+          </div>
+          <div class="col-sm-4 ">
+            <label class=" font_normal_body">阶梯累计</label>
+            <v-select id="f_ladder_sync"
+                      v-model="f_payment"
+                      placeholder='是否累计'
+                      :search="false"
+                      :value-single="true"
+                      :value.sync="model.f_ladder_sync"
+                      :options='ladder'
+                      close-on-select clear-button></v-select>
+          </div>
+          <div class="col-sm-4"
+               :class="[$v.f_stair_use.required || $v.f_stair_use.dctest ? 'has-error' : 'has-success']"
+               v-if=" model.metermessage.gasbrand[0].f_meter_type ==='物联网表'&& model.f_ladder_sync !=='不同步'">
+            <label class=" font_normal_body">阶梯用量</label>
+            <input class="input_search" style="width:60%" type="number"
+                   v-validate:f_stair_use='{required: true, dctest: [0, ">=" ] }'
+                   v-model="model.f_stair_use" placeholder="旧表阶梯使用量">
+          </div>
+          <div class="col-sm-4 "
+               v-if="(model.metermessage.gasbrand[0].f_meter_type ==='物联网表' && model.metermessage.gasbrand[0].f_hascard ==='是')
+                      || (model.f_type.includes('清零') && row.f_meter_type ==='物联网表' && row.f_hascard ==='是')">
+            <label class=" font_normal_body">开户方式</label>
+            <v-select id="f_open_type"
+                      v-model="f_payment"
+                      placeholder='开户方式'
+                      :search="false"
+                      :value-single="true"
+                      :value.sync="model.f_open_type"
+                      :options='opentype'
+                      close-on-select clear-button></v-select>
+          </div>
+          <div v-if="config.aroundmeter" class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
+            <label  class="font_normal_body">新表表向</label>
+            <v-select :value.sync="model.f_newaroundmeter" :options='aroundmeters' placeholder='新表表向'
+                      :value-single="true"
+                      close-on-select
+                      v-model='model.f_newaroundmeter'></v-select>
+          </div>
+        </div>
+        <div class="row auto">
+          <div class="col-sm-12"
+               v-if="!commitflag"
+          >
+            <label class="font_normal_body ">备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"></textarea>
+          </div>
+          <div class="col-sm-12"
+               :class="[$v.f_comments.required ? 'has-error' : 'has-success']"
+               v-if="commitflag"
+          >
+            <label class="font_normal_body ">备&emsp;&emsp;注</label>
+            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"
+                      v-validate:f_comments='{required: true}'
+            ></textarea>
+          </div>
+        </div>
+        <div class="col-sm-12" v-if="config.changeReason"
+             :class="[$v.f_changetables_reason.required ? 'has-error' : '']">
+          <label class="font_normal_body">换表原因</label>
+          <textarea class="input_textarea" rows="3" style="width:87%;"
+                    v-model="model.f_changetables_reason"
+                    v-validate:f_changetables_reason='{required: true}'>
+          </textarea>
+        </div>
+        <div style="text-align:right;height:auto;">
+          <button class="button_search" v-show="config.approve == true ? applyButtonShow : false" type="button" @click="apply()"
+                  :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid || (config.changeReason && !model.f_changetables_reason)"
+          >换表审核
+          </button>
+          <button class="button_search" v-show="config.approve == true ? !applyButtonShow : true" type="button" @click="confirmbefore()"
+                  :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid || (config.changeReason && !model.f_changetables_reason)"
+          >确认
+          </button>
+          <button class="button_clear" v-show="applyButtonShow" type="button" @click="clean()">取消
+          </button>
+        </div>
+      </form>
+      <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' v-ref:printbill @toggle="close" :data='row' @printok="printok" ></print-bill>
+    </validator>
+    <modal :show.sync="addTaskModalShow" backdrop="false" width="40%" title="创建任务" small="true" @modal-close="addTaskModalClose()">
+      <article slot="modal-body" class="row" style="padding: 10px">
+        <add-apply-task :applytaskobj.sync="addTaskModel" @valid="addTaskValid = true" @invalid="addTaskValid = false">
+        </add-apply-task>
+      </article>
+      <footer slot="modal-footer" class="modal-footer" style="text-align: right;border: 0">
+        <button class="btn button_search" @click="addTask()"
+                :disabled="!addTaskValid">新增审核任务
+        </button>
+      </footer>
+    </modal>
+  </div>
+  <upload  v-if="config.showupload" :blodid="row.f_userinfo_id" :businessid="model.randomBusinessId" isremark="true" fusetype="换表&清零"></upload>
+</template>
+<script>
+/**
+ *换表管理
+ *组合界面，加载机表，物联网表，气量卡表，金额卡表旧表信息，以及控制显示换新表信息
+ */
+import { HttpResetClass } from 'vue-client'
+let getPrice = async function (self) {
+  await self.$LoadParams.loadParam(self.$login.f.orgid)
+  await self.$getConfig(self, 'ChangeMeter')
+
+  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_ladder_sync = self.config.ladderSync
+  self.mulPrint = self.config.printType instanceof Array
+  self.model.f_use_type = self.config.billType
+  self.model.f_bill_type = self.model.f_print
+  self.hasValidateBill = self.config.hasBillManage
+
+  self.model.f_open_type = self.config.open_way
+  self.isGas = (self.row.f_collection_type == '按气量')
+
+  let http = new HttpResetClass()
+  let param = {
+    tablename: 't_detailprice',
+    condition: `f_price_name = '1' and f_stairprice_id = '${self.row.f_stairprice_id}'`
+  }
+  let res = await http.load('POST', 'rs/sql/saleSingleTable', {
+    data: param
+  }, {
+    resolveMsg: null,
+    rejectMsg: '获取一阶单价!!'
+  })
+  if (res.data.length > 0) {
+    self.model.f_remanent_price = res.data[0].f_price
+  }
+  let temp = {
+    tablename: 't_meter_book',
+    condition: `f_book_state='有效' and f_filiale_id='${self.$login.f.orgid}'`
+  }
+  let meterbooks = await http.load('POST', 'rs/sql/saleSingleTable', {data: temp},
+          {resolveMsg: null, rejectMsg: '获取抄表册信息失败！！'})
+  if (meterbooks.data.length > 0) {
+    let options = []
+    for (let i = 0; i < meterbooks.data.length; i++) {
+      let tmp = {label: meterbooks.data[i].f_book_name, value: `${meterbooks.data[i].id}`}
+      options.push(tmp)
+    }
+    self.meterbookoptions = options
+  }
+  if (self.row.f_price_type === '固定气价') {
+    self.model.f_stair_use = 0
+  } else {
+    let a = await http.load('POST', 'rs/logic/commonCal', {data: {model: self.row, isGasValue: 0, value: 0}}, {resolveMsg: null, rejectMsg: '获取阶梯使用情况出错'})
+    self.model.f_stair_use = a.data.sumamount
+  }
+  self.newinfo.pricetype = [self.row.f_price_type]
+  let params = {
+    f_user_type: self.row.f_user_type,
+    f_gasproperties: self.row.f_gasproperties,
+    f_price_type: self.row.f_price_type,
+    filter: self.$login.f.orgid
+  }
+  let rs = self.$GetSaleParam.getPrice(params)
+  rs.forEach((val) => {
+    if (val.label == self.row.f_price_name) {
+      self.newinfo.pricename = [val.value]
+    }
+  })
+  self.initData()
+}
+export default {
+  title: '换表登记',
+  data () {
+    return {
+      resid: [],  // 存放新增的f_files表中id
+      model: {
+        f_flowmeter_number: '',
+        f_flowmeter_pass: '',
+        f_flowmeter_brand: '',
+        f_flowmeter_model: '',
+        f_flowmeter_accuracy: '',
+        f_flowmeter_mpa_level: '',
+        f_flowmeter_install_date: this.$login.toStandardTimeString(),
+        metermessage: {
+          f_meter_type: '',
+          gasbrand: '',
+          gasmodel: '',
+          f_meternumber: '',
+          f_meter_base: '',
+          f_metertitles: '',
+          f_oldmeter_use_reference: 0 // 旧表使用量参考值
+        },
+        // 旧表底数
+        f_ladder_sync: '',
+        f_using_base_old: '',
+        // 换表补气量
+        f_remanent_gas: 0,
+        // 换表补气单价
+        f_remanent_price: 0,
+        f_open_type: '',
+        f_remanent_money: 0,
+        f_type: '换新表',
+        f_comments: '',
+        f_othereason: '',
+        f_stair_use: '',
+        f_payment: '现金缴费',
+        f_print: '普通收据',
+        f_state: '有效',
+        f_changemeter_date: this.$login.toStandardTimeString(),
+        f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0,
+        f_difference_reason: '',
+        // 金额表剩余金额
+        f_using_fee_old: 0,
+        randomBusinessId: ''
+      },
+      meterinfo: false,
+
+      meterbookoptions: [],
+      // 控制气量和金额的转换显示
+      changeType: '',
+      config: {
+        hasPrint: false,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        billType: '其他费用',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金缴费',
+        ladderSync: '同步',
+        open_way: '指令开户',
+        hasArrearsChange: false, // 是否可以有欠费换表
+        f_change_operator: false, // 换表人是否必填
+        castInt: true,
+        aroundmeter: false, // 表向
+        changeReason: false, // 换表原因
+        changePrice: false, // 气价任意变更权限
+        dispatch: false, // 是否派工
+        showupload: true, //
+        approve: false  // 是否开启审核
+      },
+      print: false,
+      // 启用发票管理需要对票号进行验证
+      hasValidateBill: false,
+      validateOk: false,
+      billData: {
+        url: 'rs/report/change_meter',
+        bill: ''
+      },
+      // 控制气量金额的编辑
+      isGas: false,
+      replacewatchtype: this.$appdata.getParam('换表类型'),
+      reason: this.$appdata.getParam('换表原因') ? this.$appdata.getParam('换表原因') : [],
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      gasproperties: [],
+      addgasnum: 0,
+      addgas: false,
+      books: {
+        data: []
+      },
+      addbalance: false,
+      newinfo: {
+        f_user_type: '',
+        f_gasproperties: '',
+        pricetype: '',
+        pricename: '',
+        f_perform_date: this.$login.toStandardDateString() + ' 00:00:00' // 操作时间
+      },
+      ladder: [{label: '累计', value: '同步'}, {label: '不累计', value: '不同步'}],
+      opentype: [{label: '指令开户', value: '指令开户'}, {label: '发卡开户', value: '发卡开户'}],
+      usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+      pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
+      addTaskModel: {
+        f_task_name: '',
+        f_userinfo_code: '',
+        f_work_flow_name: '',
+        f_approval: '',
+        f_memorandum: ''
+      },
+      addTaskValid: false,
+      addTaskModalShow: false,
+      commitflag: false,
+      // 总欠费金额
+      alldue_fee: 0
+    }
+  },
+  props: {
+    row: {
+      type: Object,
+      default: undefined
+    },
+    applyButtonShow: {
+      type: Boolean,
+      default: true
+    },
+    dataModel: {
+      type: Object,
+      default: undefined
+    }
+  },
+  ready () {
+    getPrice(this)
+    this.getRandomId()
+  },
+  events: {
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      this.resid.push({id: val, f_biobid: ''})
+    }
+  },
+  computed: {
+    aroundmeters () {
+      return this.$appdata.getParam('左右表')
+    },
+    flowmeterbrands () {
+      let gasbrand = this.$GetSaleParam.getGasbrand()
+      let flowmeterbrands = []
+      for (let row of gasbrand) {
+        flowmeterbrands.push({label: row.label, value: row.label})
+      }
+      return flowmeterbrands
+    }
+  },
+  methods: {
+    getRandomId () {
+      this.model.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let res = Math.random() * 16 | 0
+        let v = c == 'x' ? res : (res & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    feeOldChange () {
+      if (this.model.f_using_fee_old) {
+        this.model.f_remanent_money = this.model.f_using_fee_old
+      }
+    },
+    addTaskModalClose () {
+      this.addTaskModel.f_work_flow_name = ''
+      this.addTaskModel.f_task_name = ''
+      this.addTaskModel.f_userinfo_code = ''
+      this.addTaskModel.f_approval = ''
+      this.addTaskModel.f_memorandum = ''
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    },
+    close () {
+      this.print = false
+      this.printok()
+    },
+    async printok () {
+      let msg = await this.$showMessage('已成功换表，是否进入补气或购气界面', ['confirm', 'cancel'])
+      if (msg == 'confirm') {
+        this.$dispatch('get-new-row', this.row)
+      } else {
+        this.$dispatch('success', '换表')
+      }
+    },
+    flowmetermodels (label) {
+      let gasbrand = this.$GetSaleParam.getGasbrand()
+      let flowmetermodels = []
+      for (let row of gasbrand) {
+        if (row.label == label) {
+          for (let gasmodel of row.value.gasmodel) {
+            flowmetermodels.push({label: gasmodel.label, value: gasmodel.label})
+          }
+          break
+        }
+      }
+      return flowmetermodels
+    },
+    getPricenames () {
+      console.log('气价。，。。', this.newinfo.pricetype)
+      let rs = []
+      if (this.row.f_user_type && this.row.f_gasproperties && this.newinfo.pricetype.length === 1) {
+        let params = {
+          f_user_type: this.row.f_user_type,
+          f_gasproperties: this.row.f_gasproperties,
+          f_price_type: this.newinfo.pricetype[0],
+          filter: this.$login.f.orgid
+        }
+        if (this.config.changePrice) {
+          rs = this.$GetSaleParam.getPriceAllOther(params)
+        } else {
+          rs = this.$GetSaleParam.getPrice(params)
+        }
+      }
+      if (rs.length === 0) {
+        this.newinfo.f_price_name = ''
+      }
+      return rs
+    },
+    userTypeChange () {
+      this.gasproperties = []
+      if (this.newinfo.f_user_type.length === 1) {
+        this.gasproperties = this.$appdata.getParam(this.newinfo.f_user_type[0])
+      }
+    },
+    // 返回
+    clean () {
+      this.$dispatch('success', '换表', this.row)
+    },
+    addTask () {
+      if (this.addTaskModel.f_userinfo_code != this.row.f_userinfo_code) {
+        this.$showAlert('请填写正确的用户编号！！！', 'warning', 3000)
+        return
+      }
+      let memorandum = {
+        f_memorandum: this.addTaskModel.f_memorandum
+      }
+      this.model.f_business_name = '换表'
+      this.model.f_user_name = this.row.f_user_name
+      this.model.fusetype = '换表&清零'
+      this.model.filesids = this.resid
+      let data = {
+        f_created_by: this.$login.f.name,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        addModel: this.addTaskModel,
+        f_memorandum: JSON.stringify(memorandum),
+        f_userinfo_json: this.model,
+        f_userinfo_id: this.row.f_userinfo_id
+      }
+      this.$resetpost('rs/logic/future_createWorkFlowTask', {'data': data}
+        , {resolveMsg: null, rejectMsg: '新增任务失败！！'}).then(
+        (res) => {
+          this.$showAlert(res.data.msg + '请等待审批完成后去流程页面进行操作！！！', 'info', 3000)
+          this.addTaskModalClose()
+          this.addTaskModalShow = false
+        }
+      )
+    },
+    async apply () {
+      this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请换表`
+      this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+      this.addTaskModalShow = true
+    },
+    async confirmbefore () {
+      if (this.model.metermessage.f_meter_type[0] !== '机表') {
+        if (!this.config.hasArrearsChange && this.books.data && this.books.data.length > 0) {
+          if (this.books.data[0].f_whether_pay === '否') {
+            this.$showAlert('换表失败，该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
+            this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+          } else {
+            this.confirm()
+          }
+        } else {
+          this.confirm()
+        }
+      } else {
+        this.confirm()
+      }
+    },
+    async confirm () {
+      let msg = ''
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a > b) {
+          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 = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
+        }
+      }
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
+        this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            debugger
+            let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
+            let data = {
+              downDate: this.$login.toStandardTimeString(),
+              startDate: this.$login.toStandardDateString(),
+              endDate: this.$login.toStandardDateString(),
+              condition: `f_userfiles_id = '${this.row.f_userfiles_id}'`,
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_meternumber: this.row.f_meternumber,
+              f_userinfo_id: this.row.f_userinfo_id,
+              f_userfiles_id: this.row.f_userfiles_id,
+              f_serial_number: this.model.f_serial_number,
+              f_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
+              f_price_id: this.row.f_price_id
+            }
+            this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
+              console.log('成功')
+
+              if (this.model.metermessage.f_meter_type[0] != '机表') {
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作1！')
+                this.$showAlert('换表失败，该表已产生欠费，请清欠后，重新进行换表操作！', 'warning', 5000)
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作2！')
+                this.$dispatch('refresh')
+              } else {
+                this.saveobj()
+              }
+            })
+          } else {
+
+          }
+        })
+      } else {
+        if (this.row.f_meter_type.includes('气量卡表') && (this.model.f_using_base_old > (this.row.f_total_gas + this.row.f_initial_base + this.row.f_remanent_gas))) {
+          await this.$showMessage(`该表可能存在超用，请确定是否继续进行换表操作！！！,或者取消进入超用收费！`, ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              this.saveobj()
+            } else {
+            }
+          })
+        } else {
+          this.saveobj()
+        }
+      }
+    },
+    async saveobj () {
+      try {
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
+        this.model.f_orgid = this.$login.f.orgid
+        this.model.f_orgname = this.$login.f.orgs
+        this.model.f_depid = this.$login.f.depids
+        this.model.f_depname = this.$login.f.deps
+        this.model.f_zoneid = this.$login.f.zoneid
+        this.model.f_zones = this.$login.f.zones
+        this.model.alldue_fee = this.alldue_fee
+        let data = {
+          model: this.model,
+          f_meter_book: this.newinfo.f_meter_book[0],
+          old: this.row
+        }
+        // 如果更新了气价
+        if (this.newinfo.pricename.length > 0) {
+          data.newinfo = this.newinfo.pricename[0].f_price_id
+        }
+        let meterinfo = await this.$resetpost('rs/logic/changeMeter', data, {
+          resolveMsg: null,
+          rejectMsg: '换表失败！！！'
+        })
+
+        if (this.config.showupload) {
+          let param = []
+          for (let row of this.resid) {
+            param.push({id: row.id})
+          }
+          let data1 = {
+            param: param,
+            f_blobid: meterinfo.data.id
+          }
+          console.log('-------------------------->', data1)
+          await this.$resetpost('rs/logic/updatefiles', data1)
+        }
+        // 赋值【新表id】
+        this.row.f_userfiles_id = meterinfo.data.new_userfiles_id
+
+        if (this.newinfo.pricename.length > 0) {
+          let param = {
+            f_userinfo_id: this.row.f_userinfo_id,
+            f_userfiles_id: this.row.f_userfiles_id,
+            f_user_id: this.row.f_user_id,
+            f_user_name: this.row.f_user_name,
+            f_user_type: this.newinfo.f_user_type[0],
+            f_gasproperties: this.newinfo.f_gasproperties[0],
+            f_price_type: this.newinfo.pricetype[0],
+            f_price_id: this.newinfo.pricename[0].f_price_id,
+            f_filialeid: this.$login.f.orgid,
+            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,
+            f_perform_date: this.newinfo.f_perform_date,
+            f_change_reason: '换表调价'
+          }
+
+          await this.$resetpost('rs/logic/user_pricechange', {data: param}, {resolveMsg: '更新气价成功', rejectMsg: '更新气价失败'})
+        }
+        // 开始打票
+        if (this.config.hasPrint) {
+          if (this.model.f_print.indexOf('电子发票') == -1) {
+            if (this.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              this.row.id = meterinfo.data.id
+              this.row.f_bill_type = '换表'
+              this.row.f_bill_style = this.model.f_print[0]
+              this.print = true
+            } else {
+              this.row.id = meterinfo.data.id
+              this.print = true
+            }
+          } else {
+            this.printok()
+          }
+        } else {
+          if (!this.config.approve) {
+            this.printok()
+          }
+        }
+
+        if (this.config.dispatch) {
+          await this.$showMessage(`是否添加派工单`, ['confirm', 'cancel']).then((res) => {
+            if (res === 'confirm') {
+              let batch = {
+                sf_id: meterinfo.data.id,
+                f_userinfo_code: this.row.f_userinfo_code,
+                f_dispathch_name: this.row.f_user_name,
+                f_phone: this.row.f_user_phone,
+                f_dispathch_address: this.row.f_address,
+                f_dispathch_type: '安装',
+                f_source: '换表',
+                f_remarks: this.model.f_comments,
+                f_operator_date: this.$login.toStandardTimeString(),
+                f_orgid: this.$login.f.orgid,
+                f_dispathch_state: '待分配'
+              }
+              console.log('111:', batch)
+              this.$resetpost('rs/logic/savePatch', batch).then((res1) => {
+                // this.params.rows.splice(index, 1)
+                console.log('更新成功！--------------------->', res1.data.id)
+              })
+            }
+          })
+        }
+        if (this.config.approve) {
+          console.log('存储换表业务信息')
+          await this.$dispatch('futureapply', meterinfo)
+        }
+      } catch (error) {
+        console.log('抛出的错误。。', error)
+        let res = error.data.toString()
+        this.$showAlert(res, 'danger', 2000)
+        this.$dispatch('refresh')
+      }
+    },
+    async pregasChange () {
+      if (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base)) {
+        await this.$showMessage(`录入旧表底数小于系统就表底数请再次核对！`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+          } else {
+            this.model.f_using_base_old = ''
+          }
+        })
+      }
+      this.commitflag = false
+      // 每种表对应的计算方式都不一样
+      if (this.row.f_meter_type == '气量卡表') {
+        this.calGasCardRemanent()
+      } else if (this.row.f_meter_type == '金额卡表') {
+        // this.$showAlert('金额卡表换表尚在开发中，敬请期待！！', 'warning', 5000)
+        // this.$dispatch('refresh')
+        this.calMoneyCardRemanent()
+      } else if (this.row.f_meter_type == '物联网表') {
+        this.Iotjisuan()
+      }
+      let msg = ''
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a > b) {
+          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 = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
+        }
+      }
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
+        this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let url = this.row.f_meter_type.includes('物联网表') ? 'rs/logic/changeMeterWebHand' : 'rs/logic/changeMeterHand'
+            let data = {
+              downDate: this.$login.toStandardTimeString(),
+              startDate: this.$login.toStandardDateString(),
+              endDate: this.$login.toStandardDateString(),
+              condition: `f_userfiles_id = '${this.row.f_userfiles_id}'`,
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_meternumber: this.row.f_meternumber,
+              f_userinfo_id: this.row.f_userinfo_id,
+              f_userfiles_id: this.row.f_userfiles_id,
+              f_serial_number: this.model.f_serial_number,
+              f_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
+              f_price_id: this.row.f_price_id
+            }
+            this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
+              console.log('成功')
+              if (this.row.f_meter_type.includes('物联网表')) {
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作1！')
+                this.$showAlert('换表失败，该表已产生欠费，请清欠后，重新进行换表操作！', 'warning', 5000)
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作2！')
+                this.$dispatch('refresh')
+              } else {
+                this.$dispatch('resflushrowdata')
+                // this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              }
+            })
+          }
+        })
+      }
+    },
+    async Iotjisuan () {
+      let gas = (this.model.f_using_base_old - 0) - (this.row.f_meter_base - 0)
+      let getAmount = await this.$CommonService.gasCalculate(this.row, gas)
+      let money = getAmount.data.chargenum
+    },
+    typeChange () {
+      if (this.model.f_type.includes('清零')) {
+        let oldMeter = {
+          f_meter_type: this.row.f_meter_type,
+          f_collection_type: this.row.f_collection_type
+        }
+        let newMeter = {
+          f_meter_type: this.row.f_meter_type,
+          f_collection_type: this.row.f_collection_type
+        }
+        let res = this.$ChangeMeter.changeMeter(oldMeter, newMeter, this.row)
+        console.log('看看新旧表的转换结果', res)
+        this.changeType = res.name
+      } else {
+        this.changeType = ''
+      }
+    },
+
+    initData () {
+      this.commitflag = false
+      if (this.row.f_meter_type == '物联网表') {
+        // 判断是否需要结算
+        if (this.row.f_collection_type == '按气量') {
+          this.calGasIOTRemanent()
+        } else {
+          this.calMoneyIOTRemanent()
+        }
+      } else if (this.row.f_meter_type == '机表') {
+        this.validateOwe()
+      } else {
+        this.pregasChange()
+      }
+    },
+
+    calGasCardRemanent () {
+      // 拿到旧表底数 和【累计购气量+初始底数】比较  这里剩余气量如果是清零补气的就不加，如果是换表补气的就加
+      let param = this.row.f_total_gas + this.row.f_initial_base
+
+      if (this.row.f_remanent_type == 1) {
+        param += this.row.f_remanent_gas
+      }
+
+      if (this.model.f_using_base_old > param) {
+        this.$showAlert('该表可能存在超用，请核实输入后进行换表操作！！', 'warning', 5000)
+        this.$dispatch('refresh')
+      }
+      if (this.model.f_remanent_price > 0) {
+        this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
+      }
+    },
+
+    calMoneyCardRemanent () {
+      if (!this.model.f_remanent_money) {
+        this.model.f_remanent_money = ''
+      }
+    },
+
+    calGasIOTRemanent () {
+      this.model.f_remanent_gas = (this.row.f_balance_gas - 0)
+      if (this.row.f_remanent_type == 1) {
+        this.model.f_remanent_gas += (this.row.f_remanent_gas - 0)
+      }
+    },
+    calMoneyIOTRemanent () {
+      this.model.f_remanent_money = (this.row.f_balance_amount - 0).toFixed(4)
+      if (this.row.f_remanent_type == 1) {
+        if (this.row.f_remanent_gas > 0) {
+          this.model.f_remanent_money = (this.model.f_remanent_money - 0) + ((this.row.f_remanent_gas - 0) * (this.row.f_remanent_price - 0)).toFixed(4)
+        } else if (this.row.f_remanent_money > 0) {
+          this.model.f_remanent_money = (this.model.f_remanent_money - 0) + (this.row.f_remanent_money - 0)
+        }
+      }
+    },
+
+    gasModelChange (val) {
+      console.log('新表信息', val)
+      if (val.length > 0) {
+        this.commitflag = false
+        // 新气表信息已选
+        let oldMeter = {
+          f_meter_type: this.row.f_meter_type,
+          f_collection_type: this.row.f_collection_type
+        }
+        let newMeter = {
+          f_meter_type: val[0].f_meter_type,
+          f_collection_type: val[0].f_collection_type
+        }
+        let res = this.$ChangeMeter.changeMeter(oldMeter, newMeter, this.row)
+        console.log('看看新旧表的转换结果', res)
+        this.changeType = res.name
+/*        if (this.addbalance) {
+          this.addbalance = false
+          this.model.f_remanent_money = (this.model.f_remanent_money - 0) - (this.row.f_balance - 0)
+        }
+        if (this.addgas) {
+          this.addgas = false
+          this.model.f_remanent_gas = (this.model.f_remanent_gas - 0) - (this.addgasnum - 0)
+          this.addgasnum = 0
+        }
+        if (newMeter.f_meter_type == '物联网表' && newMeter.f_collection_type == '按金额' && (!this.addbalance)) {
+          this.addbalance = true
+          this.model.f_remanent_money = this.model.f_remanent_money ? (this.model.f_remanent_money - 0) + (this.row.f_balance - 0) : (this.row.f_balance - 0)
+          if (!this.isGas) {
+            this.addgas = true
+          }
+        }
+        if (newMeter.f_meter_type == '物联网表' && newMeter.f_collection_type == '按气量' && (!this.addgas)) {
+          this.addgas = true
+          debugger
+          this.addgasnum = ((this.row.f_balance - 0) / this.model.f_remanent_price).toFixed(4)
+          this.model.f_remanent_gas = this.model.f_remanent_gas ? (this.model.f_remanent_gas - 0) + (this.addgasnum - 0) : this.addgasnum
+          if (!this.isGas) {
+            this.addbalance = true
+            this.model.f_remanent_money = this.model.f_remanent_money ? (this.model.f_remanent_money - 0) + (this.row.f_balance - 0) : (this.row.f_balance - 0)
+          }
+        } */
+      }
+    },
+
+    remanentChange () {
+      this.commitflag = true
+      // 气量转金额 或者 金额转气量的时候对气量和金额不做限制， 可以修改， 但是只变单价
+      this.model.f_remanent_price = ((this.model.f_remanent_money) / (this.model.f_remanent_gas)).toFixed(4)
+      if (this.model.f_remanent_price == 'NaN') {
+        this.model.f_remanent_price = 0
+      }
+    },
+
+    async validateOwe () {
+      let http = new HttpResetClass()
+      // 有欠费是否能换表  如果能则需要获取到欠费金额
+      if (this.config.hasArrearsChange) {
+        let res = await http.load('POST', 'rs/logic/sale_getOwe', {data: {f_userinfo_id: this.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！'})
+        let owes = []
+        for (let i = 0; i < res.data.length; i++) {
+          for (let j = 0; j < res.data[i].rows.length; j++) {
+            owes.push(res.data[i].rows[j])
+          }
+        }
+        console.log('获取到的欠费记录', owes)
+        this.alldue_fee = owes.reduce((total, item) => {
+          return total + (item.f_oughtfee + item.overdue - item.f_debt_money)
+        }, 0)
+        console.log('总欠费金额为', this.alldue_fee)
+        this.books = owes
+      } else {
+        // 如果 不能 则只需要获取到记录数，采用相对节省资源的查询
+        let books = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'f_whether_pay',
+            tablename: 't_handplan',
+            condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0 and  f_hand_state = '有效' and f_meter_state='已抄表' `,
+            orderitem: ' id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}
+        )
+        console.log('获取到的欠费记录', books)
+        this.books = books
+        // 如果是机表验证是否有欠费
+        if ((this.row.f_balance - 0) < 0) {
+          this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
+          this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+        }
+      }
+    }
+  },
+
+  watch: {
+    'row' () {
+      console.log('-------------------------------')
+      console.log(this.row)
+    },
+    'model.f_remanent_money' (val) {
+      console.log('观察补气金额', val)
+      if (!this.isGas) {
+        this.model.f_remanent_gas = (val / this.model.f_remanent_price).toFixed(4)
+      }
+      if (this.model.f_using_base_old) {
+        this.commitflag = true
+      }
+    },
+    'model.f_remanent_gas' (val) {
+      if (this.isGas) {
+        this.model.f_remanent_money = (val * this.model.f_remanent_price).toFixed(4)
+      }
+      if (this.model.f_using_base_old) {
+        this.commitflag = true
+      }
+    },
+    'dataModel' (val) {
+      console.log('看看dataModel的值：', val)
+      if (val) {
+        this.$nextTick(() => {
+          this.model = Object.assign({}, this.model, val)
+          this.resid = this.model.filesids
+        })
+      }
+      console.log('看看this.model的值：', this.model)
+    },
+    'newinfoData' (val) {
+      console.log('看看newinfoData的值：', val)
+      if (val) {
+        this.$nextTick(() => {
+          this.newinfo = Object.assign({}, this.newinfo, val)
+        })
+      }
+      console.log('看看this.newinfo的值：', this.newinfo)
+    }
+  }
+}
+</script>
+<style lang="less">
+  #ChangeMeter {
+    .col-sm-4 {
+      .font_normal_body {
+        width: 73px;
+        overflow: auto;
+        white-space: nowrap;
+        // 指滚动条两边的按钮
+        &::-webkit-scrollbar-button {
+          display: none;
+        }
+        // 滚动条的宽度
+        &::-webkit-scrollbar {
+          width: 5px !important;
+          height: 5px !important;
+        }
+        // 滚动条的设置
+        &::-webkit-scrollbar-thumb {
+          background-color: #ddd;
+          background-clip: padding-box;
+        }
+        &::-webkit-scrollbar-thumb:hover {
+          background-color: #bbb;
+        }
+        &::-webkit-scrollbar-track {
+          /*滚动条里面轨道*/
+          box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+          background: #ededed;
+        }
+      }
+    }
+  }
+</style>

package/src/filiale/dexin/sale.js

@@ -8,6 +8,8 @@ export default function () {
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter.vue'], resolve) })
   // 无卡收费
   Vue.component('no-card-meter-center', (resolve) => { require(['./NoCardMeterCenter.vue'], resolve) })
+  // 换表
+  Vue.component('change-meter', (resolve) => { require(['./ChangeMeter.vue'], resolve) })
 
   // 无卡收费
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo.vue'], resolve) })

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/yangchun/sale'
+import FilialeSale from './filiale/meihekou/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'