sale-client 4.0.69-preview → 4.0.70-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://222.222.226.211:31467/', 'http://localhost:9026/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://localhost:9026/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -11,7 +11,7 @@ var devConfig = {
     publicPath: baseConfig.output.publicPath,
     historyApiFallback: true,
     host: '127.0.0.1',
-    port: 8090,
+    port: 8089,
     open: false,
     stats: {
       colors: false, // 配置控制台输出彩色日志

package/package.json

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

package/src/filiale/ronghao/ChangeMeter.vue

@@ -227,7 +227,7 @@
             <label class=" font_normal_body">换表原因</label>
             <v-select id="f_ladder_sync"
                       v-model="f_ladder_sync"
-                      placeholder='是否累计'
+                      placeholder='换表原因'
                       :search="false"
                       :value-single="true"
                       :value.sync="model.f_changetables_reason"

package/src/filiale/ronghao/OverUseCharge.vue

@@ -0,0 +1,448 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row" style="margin-top:10px;">
+
+          <div class="col-sm-4 form-group" :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
+            <label for="f_pregas" class=" font_normal_body">*超用气量</label>
+            <input  class="input_search" style="width:60%" type="number"
+                    v-validate:f_pregas='{required: true, dctest: [0, ">=" ]}' v-model="model.f_pregas" v-scale = "[model.f_pregas, config.decimal]">
+          </div>
+
+          <div class="col-sm-4 form-group">
+            <label for="f_pregas" class=" font_normal_body">单&emsp;&emsp;价</label>
+            <input  class="input_search" style="width:60%" type="number" v-model="model.f_price" v-scale = "[model.f_price, 4]" @blur="priceChange">
+          </div>
+
+          <div class="col-sm-4 form-group">
+            <label for="f_preamount" class=" font_normal_body">超用金额</label>
+            <input  class="input_search" @blur="calCollection" style="width:60%" type="number" v-model="model.f_preamount" v-scale="[model.f_preamount, config.decimal]">
+          </div>
+        </div>
+        <div class="row" style="margin-top:10px;">
+          <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="model.f_payment"
+                      placeholder='请选择'
+                      :value.sync="model.f_payment"
+                      close-on-select
+                      :options='paytype' clear-button v-ref:payment></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"
+                      placeholder='请选择'
+                      :multiple="mulPrint"
+                      :value.sync="model.f_print"
+                      :options='printstyle'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <!--<div class="col-sm-4 form-group" v-if="model.f_payment[0].includes('POS')">-->
+          <!--<label for="f_voucher_number" class="font_normal_body">凭证号</label>-->
+          <!--<input type="text" class="input_search col-sm-2" v-model="model.f_voucher_number" placeholder="凭证号">-->
+          <!--</div>-->
+          <!--<div class="col-sm-4 form-group" v-if="!model.f_payment[0].includes('POS')">-->
+          <!--</div>-->
+          <div class="col-sm-4 form-group">
+            <label for="f_totalcost" class=" font_normal_body">应交金额</label>
+            <input  class="input_search" style="width:60%" type="number" v-model="model.f_totalcost.toFixed(config.decimal)" disabled>
+          </div>
+        </div>
+        <div class="row" style="margin-top:10px;">
+          <div class=" col-sm-4 form-group">
+            <label for="f_totalcost" class=" font_normal_body">&nbsp;上期结余</label>
+            <input  class="input_search" style="width:60%" type="number" v-model="row.f_balance" disabled>
+          </div>
+          <div class=" col-sm-4 form-group">
+            <label for="f_totalcost" class=" font_normal_body">本期结余</label>
+            <input  class="input_search" style="width:60%" type="number" v-model="f_curbalance" disabled>
+          </div>
+          <div v-if="collectionreload" class="col-sm-4 form-group" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
+            <label for="f_collection" class="font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
+            <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                   v-validate:f_collection='{required: true, dctest: [(model.f_totalcost-0), ">=" ] }'
+                   v-scale = "[model.f_collection, config.decimal]">
+          </div>
+        </div>
+
+        <div class="row" style="margin-top:10px;">
+          <div class="col-sm-4 form-group" v-if="!mjshow" >
+            <label for="f_serial_number" class="font_normal_body">&nbsp;业务单号</label>
+            <input class="input_search" style="width:60%"  type="text"
+                   v-model="model.f_serial_number" placeholder="业务单号">
+          </div>
+          <div class="col-sm-4 form-group" v-if="mjshow" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <label for="f_serial_number" class="font_normal_body">&nbsp;业务单号</label>
+            <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
+                   v-model="model.f_serial_number" placeholder="业务单号">
+          </div>
+          <div class=" col-sm-4 form-group" :class="[$v.addtotal.required || $v.addtotal.dctest ? 'has-error' : 'has-success']">
+            <label for="f_print" class="font_normal_body">是否累计</label>
+            <input class="input_search" style="width:60%"  type="text" v-validate:addtotal='{required: true }' v-show="false"
+                   v-model="model.addtotal" placeholder="是否累计">
+            <v-select id="addtotal"
+                      v-model="model.addtotal"
+                      placeholder='请选择'
+                      :search="false"
+                      :value.sync="model.addtotal"
+                      :options='addtotals'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+          <div v-if="collectionreload" class="col-sm-4 form-group">
+            <label for="f_is_liability" class="font_normal_body">应负款</label>
+            <input id="f_is_liability" class="input_search" style="width:60%" type="number" v-model="model.f_is_liability" disabled>
+          </div>
+
+        </div>
+        <div class="row" style="margin-top:5px;">
+          <div class="col-sm-9">
+          </div>
+          <div class="col-sm-3">
+            <span v-if="$v.f_collection.dctest" style="color:red ">收款不能小于应收金额</span>
+          </div>
+        </div>
+        <div class="row" style="padding-top: 0.5em;">
+          <div class="col-sm-12 form-group">
+            <label for="f_comments" class="font_normal_body">&nbsp;备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:87%" v-model="model.f_comments" placeholder="备注"/>
+          </div>
+        </div>
+        <div class="row" style="margin-top:10px;" v-if="!config.notShowFormula && calculatedetail">
+          <div class="col-sm-4 form-group col-sm-offset-7">
+            <strong>计算公式: {{calculatedetail}}</strong>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-8">
+            <strong style="color:blue">温馨提示: 若为阶梯价，只按照一阶进行计算，并不计入阶梯!!</strong>
+          </div>
+        </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-on:toggle="close" :data='row' @printok="printok" v-ref:printbill></print-bill>
+      <div style="text-align:right;margin-top:30px;margin-right:50px;">
+        <payment-code-button :clickable="!$v.valid || validateOk"
+                             :payment.sync="model.f_payment" :payment-data="paytype"
+                             @confirm-payment="confirm()">
+        </payment-code-button>
+        <button class="button_search" @click="checkInvoiceMsg()"  :disabled='!$v.valid || validateOk'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <eticket-modal :show="eticket_msg" @closemodalshow="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
+  <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
+  <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+  <upload :blodid="blodid" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="超用收费"></upload>
+</template>
+<script>
+/**
+*综合业务
+*超用收费组件
+*/
+
+let getOverUseGen = async function (self) {
+  await self.$getConfig(self, 'OverUseCharge')
+  console.log('超用config...', self.config)
+  self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  self.model.f_payment = [self.config.payment]
+  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 = Object.assign({}, self.model, self.row)
+  self.model.f_comments = ''
+  // 获取单价（阶梯使用一阶， 固定直接是固定）
+  let res = await self.$CommonService.feeCalculate(self.model, 0)
+  if (self.row.f_price_type == '固定气价') {
+    self.model.f_price = res.data.chargeprice[0].f_price - 0
+  } else if (self.row.f_price_type == '阶梯气价') {
+    self.model.f_price = res.data.f_stair1price - 0
+  }
+}
+
+let overChargeGen = async function (self) {
+  try {
+    // 组织价格明细
+    self.model.chargeprice = [{
+      f_price: (self.model.f_price - 0),
+      f_gas: self.model.f_pregas,
+      f_money: self.model.f_preamount,
+      f_price_name: self.row.f_meter_type == '固定气价' ? '固定气价' : '阶梯1',
+      f_user_id: self.row.f_user_id,
+      f_userfiles_id: self.row.f_userfiles_id,
+      f_operate_date: self.$login.toStandardTimeString(),
+      f_state: '有效',
+      f_type: '超用收费'
+    }]
+
+    // 加入扫码盒付款码支付流水号
+    self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+
+    let res = await self.$ChangeMeterService.overCharge(self.model, self.row)
+    console.log('超用收费返回id', res)
+    if (self.config.showupload) {
+      let param = []
+      for (let row of self.resid) {
+        param.push({id: row.id})
+      }
+      let data = {
+        param: param,
+        f_blobid: res.data
+      }
+      await self.$resetpost('api/af-revenue/logic/updatefiles', data)
+    }
+    if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
+      if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
+        if (self.config.hasBillManage) {
+          // 启用发票管理，获取票据管理中的票号并存储记录
+          self.row.id = res.data
+          self.row.f_bill_type = '超用收费'
+          self.row.f_bill_style = self.model.f_print[0]
+          self.print = true
+        } else {
+          self.row.id = res.data
+          self.print = true
+        }
+      } else {
+        if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
+          // self.$CommonService.openEticket(res.data, '超用收费')
+          self.row.id = res.data
+          self.eticket_show = true
+          self.row.f_print = self.model.f_print[0]
+          await self.$refs.eticketbill.openETicket(res.data, self.row, '超用收费')
+        }
+      }
+    } else {
+      self.$dispatch('success')
+    }
+  } catch (error) {
+    console.log('捕获到异常', error)
+    if (error instanceof Object) {
+      self.$showAlert(error.data, 'danger', 0)
+    } else {
+      self.$showAlert(error, 'danger', 0)
+    }
+    self.$showAlert(error, 'danger', 0)
+    self.$dispatch('refresh')
+  }
+}
+
+export default {
+  title: '超用收费',
+  data () {
+    return {
+      config: {
+        notShowFormula: false, // 不显示计算公式,默认显示
+        showupload: true, // 默认不显示附件
+        hasPrint: false,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金缴费',
+        decimal: 4
+      },
+      disable: false,
+      total: 0,
+      blodid: '',
+      randomBusinessId: '',
+      resid: [],  // 存放新增的f_files表中id
+      collectionreload: true,
+      model: {
+        f_pregas: '',
+        f_price: 0,
+        f_preamount: 0,
+        f_totalcost: 0,
+        f_collection: 0,
+        f_balance: '',
+        f_curbalance: '',
+        f_payment: '现金缴费',
+        f_print: [],
+        f_voucher_number: '',
+        f_comments: '',
+        addtotal: '是',
+        f_is_liability: 0
+      },
+      // 本期结余
+      f_curbalance: 0,
+      addtotals: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+      cal: false,
+      calculatedetail: '',
+
+      oldprice: 0,
+
+      // 启用发票管理需要对票号进行验证
+      hasValidateBill: false,
+      validateOk: false,
+
+      billData: {
+        url: 'api/af-revenue/report/overuse_bill',
+        bill: ''
+      },
+      print: false,
+      eticket_msg: false,
+      eticket_show: false,
+      mulPrint: false,
+      paytype: this.$appdata.getParam('付款方式'),
+      printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
+      printstyle: this.$appdata.getParam('打印格式'),
+      mjshow: false
+    }
+  },
+  props: ['row'],
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+    // 获取超用记录并赋值
+    getOverUseGen(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: ''})
+    }
+  },
+  methods: {
+    getRandomId () {
+      this.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)
+      })
+    },
+    confirm () {
+      this.model.f_curbalance = this.f_curbalance
+      this.$showMessage(`对客户${this.row.f_user_name}进行超用收费，确定要进行该操作吗？`, ['confirm', 'cancel']).then(async (res) => {
+        if (res === 'confirm') {
+          let ss = await this.$refs.paymentcode.flowPath()
+          this.$refs.paymentcode.paymentCodeShow = false
+          console.log('付款码操作返回', ss)
+          if (!ss.result) return
+
+          this.clickConfirm = true
+          this.$dispatch('no-button')
+          overChargeGen(this)
+        }
+      })
+    },
+    // 校验发票信息
+    checkInvoiceMsg (flag) {
+      // 收款回车时, 如果确认按钮是灰色不进行任何操作
+      if (flag) return
+      console.log(this.model.f_print[0])
+      if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
+        if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        if (!this.row.f_email) {
+          this.row.f_email = this.row.f_email
+        }
+        this.eticket_msg = true
+      } else {
+        this.confirm()
+      }
+    },
+    eticket_toggle () {
+      this.eticket_show = false
+      this.$dispatch('success', '超用收费')
+    },
+    clean () {
+      this.$dispatch('refresh')
+    },
+    close () {
+      this.showprint = false
+      this.print = false
+      this.clean()
+    },
+    printok () {
+      // 收据打完，判断是否还有其他票据进行请求
+      for (let i = 0; i < this.model.f_print.length; i++) {
+        if (this.model.f_print[i] === '电子发票') {
+          this.$CommonService.openEticket(this.row.id, '超用收费')
+        }
+      }
+      this.$dispatch('success')
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    },
+    async calPreamount () {
+      this.collectionreload = false
+      this.model.f_preamount = ((this.model.f_pregas - 0) * (this.model.f_price - 0)).toFixed(4)
+      this.model.f_totalcost = this.model.f_balance > this.model.f_preamount ? 0 : (this.model.f_preamount - 0) - (this.model.f_balance - 0)
+      this.model.f_collection = this.model.f_totalcost - 0
+      await this.$nextTick()
+      this.collectionreload = true
+    },
+    async calCollection () {
+      this.collectionreload = false
+      this.model.f_totalcost = this.model.f_balance > this.model.f_preamount ? 0 : (this.model.f_preamount - 0) - (this.model.f_balance - 0)
+      this.model.f_collection = this.model.f_totalcost - 0
+      await this.$nextTick()
+      this.collectionreload = true
+    },
+    priceChange () {
+      console.log('新旧价格', this.model.f_price, this.oldprice)
+      if (this.model.f_price - this.oldprice < 0) {
+        // 判断是否有超用价格修改权限
+        if (!this.$login.r.includes('超用价格修改')) {
+          this.$showAlert('您没有将该价格降低的权限！！', 'warning', 3000)
+          this.model.f_price = this.oldprice
+        }
+      }
+    }
+  },
+  watch: {
+    'model.f_pregas' () {
+      this.calPreamount()
+    },
+    'model.f_price' (newVal, oldVal) {
+      this.oldprice = oldVal
+      this.calPreamount()
+    },
+    'model.f_payment' (val) {
+      // 根据付款方式增加业务单号
+      if (val == '免交') {
+        this.mjshow = true
+      } else {
+        this.mjshow = false
+      }
+    },
+    'model.f_collection' (newVal) {
+      this.model.f_is_liability = newVal
+    }
+  },
+  computed: {
+    'f_curbalance' () {
+      if (this.model.f_preamount) {
+        return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+      } else {
+        return this.model.f_balance
+      }
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/ronghao/ResetMeter.vue

@@ -258,6 +258,17 @@
                       close-on-select clear-button></v-select>
           </div>
         </div>
+        <div class="col-sm-4 ">
+          <label class=" font_normal_body">清零原因</label>
+          <v-select id="f_ladder_sync"
+                    v-model="f_ladder_sync"
+                    placeholder='清零原因'
+                    :search="false"
+                    :value-single="true"
+                    :value.sync="model.f_changetables_reason"
+                    :options='resetreason'
+                    close-on-select clear-button></v-select>
+        </div>
         <div class="row auto">
           <div class="col-sm-12"
                v-if="!commitflag"
@@ -455,6 +466,7 @@ export default {
       // 控制气量金额的编辑
       isGas: false,
       replacewatchtype: this.$appdata.getParam('换表类型'),
+      resetreason: this.$appdata.getParam('清零原因') ? this.$appdata.getParam('清零原因') : [],
       reason: this.$appdata.getParam('换表原因') ? this.$appdata.getParam('换表原因') : [],
       paytype: this.$appdata.getParam('付款方式'),
       printstyle: this.$appdata.getParam('打印格式'),

package/src/filiale/ronghao/removeTable.vue

@@ -0,0 +1,250 @@
+<template>
+  <div class="auto" style="overflow:auto;">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row auto">
+
+          <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 class=" font_normal_body">&emsp;表底数</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, ">" ] }'
+            >
+          </div>
+        </div>
+        <div class="row" style="height: 30%">
+          <div class="col-sm-4 form-group">
+            <label  class="font_normal_body">拆表原因</label>
+            <v-select  v-model="model.f_reason"
+                      placeholder='拆表原因'
+                      :value.sync="model.f_reason"
+                      :options='reason'
+                       :value-single="true"
+                      :search="false"
+                      v-ref:reason
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-8 form-group" v-if="model.f_reason[0] === '其他'">
+            <label class="font_normal_body">其他原因</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason" placeholder="请填写原因"/>
+          </div>
+        </div>
+        <div style="text-align:right;height:auto;">
+          <button class="button_search btn-gn" type="button" @click="confirm()" :disabled="!$v.valid"
+          >确认
+          </button>
+          <button class="button_clear btn-gn" type="button" @click="clean()">取消
+          </button>
+        </div>
+        <!--<div style="height: auto;width: 100%">-->
+        <!--<div style="height: 10%">-->
+        <!--<img style="margin-top: -5px" src="../../../../../../static/images/lefticon/矩形1183.png">-->
+        <!--<a style="font-size: 16px;font-weight: 500;color: #333;text-decoration: none;">附件信息</a>&nbsp;<a style="color: #999999"></a>-->
+        <!--</div>-->
+        <!--<upload :blodid="row.f_userinfo_id" isremark="true" fusetype="换表"></upload>-->
+        <!--</div>-->
+      </form>
+    </validator>
+  </div>
+</template>
+<script>
+/**
+ *换表管理
+ *组合界面，加载机表，物联网表，气量卡表，金额卡表旧表信息，以及控制显示换新表信息
+ */
+export default {
+  title: '换表登记',
+  data () {
+    return {
+      resid: [],  // 存放新增的f_files表中id
+      model: {
+        metermessage: {
+          f_meter_type: '',
+          gasbrand: '',
+          gasmodel: '',
+          f_meternumber: '',
+          f_meter_base: 0,
+          f_metertitles: '',
+          f_oldmeter_use_reference: 0 // 旧表使用量参考值
+        },
+        // 旧表底数
+        f_using_base_old: '',
+        // 换表补气量
+        f_remanent_gas: 0,
+        // 换表补气单价
+        f_remanent_price: 0,
+        f_remanent_money: 0,
+        f_type: '换新表',
+        f_comments: '',
+        f_othereason: '',
+        f_payment: '现金缴费',
+        f_print: '普通收据',
+        f_state: '有效',
+        f_changemeter_date: this.$login.toStandardTimeString(),
+        f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0
+      },
+      meterinfo: false,
+
+      // 控制气量和金额的转换显示
+      changeType: '',
+      config: {
+        showupload: true, //
+        dispatch: false // 是否派工
+      },
+      // 控制气量金额的编辑
+      isGas: false,
+      reason: this.$appdata.getParam('拆表原因') ? this.$appdata.getParam('拆表原因') : [],
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      gasproperties: [],
+      newinfo: {
+        f_user_type: '',
+        f_gasproperties: '',
+        pricetype: '',
+        pricename: '',
+        f_perform_date: this.$login.toStandardDateString() + ' 00:00:00' // 操作时间
+      },
+      usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+      pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : []
+    }
+  },
+  props: ['row'],
+  ready () {
+
+  },
+  events: {},
+  methods: {
+
+    // 返回
+    clean () {
+      this.$dispatch('success', '换表', this.row)
+    },
+    async confirm () {
+      if (this.row.f_meter_type.includes('机表')) {
+        this.$showMessage(`将生成抄表记录，是否确认`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            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_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_price_id: this.row.f_price_id
+            }
+            this.$resetpost('api/af-revenue/logic/changeMeterHand', {data: data}, {
+              resolveMsg: '生成欠费成功',
+              rejectMsg: '生成欠费失败'
+            }).then((res) => {
+              console.log('成功')
+              this.saveobj()
+            }).catch((err) => {
+              if (err.code === 500) {
+                this.$showAlert(`本期表底数不能低于上期表底数！！`, 'warning', 5000)
+              } else if (err.code === 624) {
+                this.$showAlert(`本次抄表上期底数小于档案底数，请删除本条抄表记录，重新下发后抄表！`, 'warning', 5000)
+              } else {
+                this.$showAlert(err.message, 'warning', 5000)
+              }
+            })
+          } else {
+
+          }
+        })
+      } else if (this.row.f_meter_type.includes('卡表')) {
+        let totalGas = (this.row.f_total_gas - 0) + (this.row.f_initial_base - 0)
+        if (this.model.f_using_base_old > totalGas) {
+          this.$showAlert('该表可能存在超用，请核实输入后进行拆表操作！！', 'warning', 5000)
+          this.$dispatch('button-specifies', {name: '超用收费', value: 'over-use-charge'}, this.row)
+          return
+        }
+        this.saveobj()
+      } else {
+        // 物联网表拆表
+        this.$showMessage(`将生成抄表记录，是否确认`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            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_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_meter_type: this.row.f_meter_type,
+              f_meter_classify: this.row.f_meter_type,
+              f_price_id: this.row.f_price_id
+            }
+            // 划价
+            this.$resetpost('api/af-revenue/logic/changeMeterWebHand', {data: data}, {resolveMsg: null, rejectMsg: null }).then((res) => {
+              if(res.data.code === "9990") {
+                this.$showAlert(res.data.msg, 'warning', 5000)
+              }
+              console.log('划价成功')
+                // 保存拆表记录
+              this.saveobj()
+            })
+          } else {
+            // 取消
+          }
+        })
+      }
+    },
+    async saveobj () {
+      let res = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        data: {
+          orderitem: 'f_userfiles_id',
+          items: '*',
+          tablename: 't_userfiles',
+          condition: 'f_userfiles_id = ' + this.row.f_userfiles_id
+        }
+      })
+      console.log('=============', res.data[0])
+      let sql = `update t_userfiles set f_table_state = '拆表' where f_userfiles_id = '${this.row.f_userfiles_id}'`
+      await this.$resetpost('api/af-revenue/logic/runSQL', { sql: sql })
+      let data = {
+        // f_userfiles_id: {
+        //   f_userfiles_id: this.row.f_userfiles_id,
+
+        //   version: res.data[0].version
+        // },
+        f_table_state: '拆表',
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_user_id: this.row.f_user_id,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_user_name: this.row.f_user_name,
+        f_operat_type: '拆表',
+        f_operate_type: '拆表',
+        f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行拆表操作`,
+        f_state: '有效',
+        f_comments: this.model.f_reason,
+        f_othereason: this.model.f_othereason,
+        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_zoneid: this.$login.f.zoneid,
+        f_zones: this.$login.f.zones
+      }
+      this.$resetpost('api/af-revenue/entity/save/t_disable', data, {resolveMsg: '拆表成功', rejectMsg: '拆表失败'})
+      this.$dispatch('success')
+    }
+
+  },
+
+  watch: {}
+}
+</script>

package/src/filiale/ronghao/removeTableCancel.vue

@@ -0,0 +1,138 @@
+<template>
+    <div class="auto" style="overflow:auto;">
+        <validator name='v'>
+            <form novalidate class="form-horizontal">
+                <div class="row auto" >
+
+                </div>
+
+                <div style="text-align:right;height:auto;">
+                    <button class="button_search" type="button" @click="saveobj()"
+                    >确认
+                    </button>
+                    <button class="button_clear" type="button" @click="clean()" >取消
+                    </button>
+                </div>
+                <!--<div style="height: auto;width: 100%">-->
+                <!--<div style="height: 10%">-->
+                <!--<img style="margin-top: -5px" src="../../../../../../static/images/lefticon/矩形1183.png">-->
+                <!--<a style="font-size: 16px;font-weight: 500;color: #333;text-decoration: none;">附件信息</a>&nbsp;<a style="color: #999999"></a>-->
+                <!--</div>-->
+                <!--<upload :blodid="row.f_userinfo_id" isremark="true" fusetype="换表"></upload>-->
+                <!--</div>-->
+            </form>
+        </validator>
+    </div>
+</template>
+<script>
+/**
+ *换表管理
+ *组合界面，加载机表，物联网表，气量卡表，金额卡表旧表信息，以及控制显示换新表信息
+ */
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '换表登记',
+  data () {
+    return {
+      resid: [],  // 存放新增的f_files表中id
+      model: {
+        metermessage: {
+          f_meter_type: '',
+          gasbrand: '',
+          gasmodel: '',
+          f_meternumber: '',
+          f_meter_base: 0,
+          f_metertitles: '',
+          f_oldmeter_use_reference: 0 // 旧表使用量参考值
+        },
+                // 旧表底数
+        f_using_base_old: '',
+                // 换表补气量
+        f_remanent_gas: 0,
+                // 换表补气单价
+        f_remanent_price: 0,
+        f_remanent_money: 0,
+        f_type: '换新表',
+        f_comments: '',
+        f_othereason: '',
+        f_payment: '现金缴费',
+        f_print: '普通收据',
+        f_state: '有效',
+        f_changemeter_date: this.$login.toStandardTimeString(),
+        f_changemeter_fee: this.$appdata.getSingleValue('换表金额') ? this.$appdata.getSingleValue('换表金额') : 0
+      },
+      meterinfo: false,
+
+            // 控制气量和金额的转换显示
+      changeType: '',
+      config: {
+        showupload: true, //
+        dispatch: false // 是否派工
+      },
+            // 控制气量金额的编辑
+      isGas: false,
+      replacewatchtype: this.$appdata.getParam('换表类型'),
+      reason: this.$appdata.getParam('换表原因') ? this.$appdata.getParam('换表原因') : [],
+      paytype: this.$appdata.getParam('付款方式'),
+      printstyle: this.$appdata.getParam('打印格式'),
+      gasproperties: [],
+      newinfo: {
+        f_user_type: '',
+        f_gasproperties: '',
+        pricetype: '',
+        pricename: '',
+        f_perform_date: this.$login.toStandardDateString() + ' 00:00:00' // 操作时间
+      },
+      usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+      pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : []
+    }
+  },
+  props: ['row'],
+  ready () {
+
+  },
+  events: {
+
+  },
+  methods: {
+        // 返回
+    clean () {
+      this.$dispatch('success', '换表', this.row)
+    },
+    async saveobj () {
+      let sql = `update t_userfiles set f_table_state = '正常' where f_userfiles_id = '${this.row.f_userfiles_id}'`
+      await this.$resetpost('api/af-revenue/logic/runSQL', { sql: sql })
+      let data = {
+        // f_userfiles_id: {
+        //   f_userfiles_id: this.row.f_userfiles_id,
+        //   f_table_state: '正常',
+        //   version: this.row.version
+        // },
+        f_meter_type: this.row.f_meter_type,
+        f_userfile_id: this.row.f_userfiles_id,
+        f_user_id: this.row.f_user_id,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_user_name: this.row.f_user_name,
+        f_operat_type: '表具复位',
+        f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行表具复位操作`,
+        f_state: '有效',
+        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_zoneid: this.$login.f.zoneid,
+        f_zones: this.$login.f.zones
+      }
+      await this.$resetpost('api/af-revenue/logic/removeTableCancel', data, {resolveMsg: '复拆表成功', rejectMsg: '复拆表失败'})
+      this.$dispatch('success')
+    }
+
+  },
+
+  watch: {
+
+  }
+}
+</script>

package/src/filiale/ronghao/sale.js

@@ -36,4 +36,10 @@ export default function () {
   Vue.component('change-meter', (resolve) => { require(['./ChangeMeter'], resolve) })
   // 清零
   Vue.component('reset-meter', (resolve) => { require(['./ResetMeter'], resolve) })
+  // 超用收费
+  Vue.component('over-use-charge', (resolve) => { require(['./OverUseCharge'], resolve) })
+  // 拆表
+  Vue.component('remove-table', (resolve) => { require(['./removeTable'], resolve) })
+  Vue.component('remove-table-cancel', (resolve) => { require(['./removeTableCancel'], resolve) })
+
 }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/huaran/sale'
+import FilialeSale from './filiale/beifangshiye/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'