sale-client 3.6.177 → 3.6.179

package/package.json

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

package/src/components/charge/ChargeModal.vue

@@ -73,7 +73,7 @@
         // 如果所有提示信息均处理，获取改户数据，进入收费操作
         if (!this.warninginfo.data.info && !this.warninginfo.data.blacklist && !this.warninginfo.data.dibao) {
           this.showInformation = false
-          let data = await this.$resetpost('rs/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = ${this.$login.f.orgid}`}}, {resolveMsg: '', rejectMsg: ''})
+          let data = await this.$resetpost('rs/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = '${this.$login.f.orgid}'`}}, {resolveMsg: '', rejectMsg: ''})
           this.$emit('modalsuccess', data.data[0])
         } else { // 没有处理完，显示提示信息
           this.showInformation = true

package/src/filiale/gehua/PriceChangeCompensation/GroupCompensation.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="auto">
-    <surplus-record-detail :row.sync="row" :civill.sync="civill"></surplus-record-detail>
-    <group-jb-compensation  :row.sync="row" :civill="civill"></group-jb-compensation>
+    <surplus-record-detail :row.sync="row" :civill.sync="civill.f_civill_id"></surplus-record-detail>
+    <group-jb-compensation  :row.sync="row" :civill="civill.f_civill_id"></group-jb-compensation>
   </div>
 </template>
 <script>

package/src/filiale/gehua/PriceChangeCompensation/GroupJbCompensation.vue

@@ -190,7 +190,7 @@ let asyncCardMeterCenter = async function (self) {
       data: {
         items: 'sum(f_real_amount) f_real_amount,sum(f_surplus_fee) f_surplus_fee',
         tablename: 't_surplus_detail',
-        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill.id}') and f_state='有效' and f_whether_pay = '否' `,
+        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill}') and f_state='有效' and f_whether_pay = '否' `,
         orderitem: 'f_surplus_fee'
       }
     },

package/src/filiale/gehua/PriceChangeCompensation/OweRecordQuery.vue

@@ -119,7 +119,7 @@ export default {
           orderitem: 'f_userinfo_id'
         }
       }
-      this.$resetpost('rs/sql/singleTable_OrderBy', surplusdata).then((res) => {
+      this.$resetpost('rs/sql/singleTable_OrderBy', surplusdata, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if (res.data.length === 0) {
           this.operBtns = [
             {name: '团体缴费', value: {routeName: 'batch-charge'}},
@@ -130,7 +130,7 @@ export default {
           this.getsale()
         } else {
           this.operBtns = [{name: '团体调价补差', value: {routeName: 'group-compensation'}}]
-          this.business(this.operBtns[0])
+          this.getsale()
         }
       })
     },

package/src/filiale/qianneng/chargeBatch/BatchCharge.vue

@@ -0,0 +1,378 @@
+<template>
+  <div id="BatchCharge">
+    <div class="span" style="overflow-y: auto;">
+      <validator name='v'>
+        <form class="form-horizontal">
+          <div class="row" style="padding-top: 0.5em;">
+            <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'has-error select-error' : '']">
+              <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+              <input type="text" v-show="false" v-model="$refs.payment.selectedItems" v-validate:payment='{required: true }'>
+              <v-select id="f_payment"
+                        v-model="data.f_payment"
+                        style="width:60%"
+                        placeholder='请选择'
+                        :value.sync="data.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="data.f_print"
+                        placeholder='请选择'
+                        style="width:60%"
+                        :value.sync="data.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_overdue" class="font_normal_body">违&ensp;约&ensp;金</label>
+              <input class="input_search" style="width:60%"  type="number" v-model="data.overdue_all"
+                     v-scale="[data.overdue_all,2]" placeholder="违约金" disabled>
+            </div>
+          </div>
+          <div class="row" style="padding-top: 0.5em;" >
+            <div class="col-sm-4 form-group">
+              <label for="f_pregas" class=" font_normal_body">用&ensp;气&ensp;量</label>
+              <input class="input_search" style="width:60%"  type="number"
+                     v-model="data.oughtamount_all" placeholder="用气量"
+                     v-scale="[data.oughtamount_all, 2]" disabled>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_preamount" class="font_normal_body">实欠气费</label>
+              <input class="input_search" style="width:60%"  type="number" v-model="data.oughtfee_new_all"
+                     v-scale = "[data.oughtfee_new_all, 2]" placeholder="实欠气费" 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="data.oughtfee_all"
+                     v-scale = "[data.oughtfee_all, 2]" placeholder="应收金额" disabled>
+            </div>
+          </div>
+
+          <div class="row" style="padding-top: 0.5em;">
+            <div class="col-sm-4 form-group">
+              <label for="f_balance"  class="font_normal_body">上期结余</label>
+              <input class="input_search" style="width:60%"  type="number" v-model="data.f_balance"
+                     v-scale="[data.f_balance,4]" placeholder="上期结余" disabled>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_overdue" class="font_normal_body">本期结余</label>
+              <input class="input_search" style="width:60%"  type="number" v-model="curbalance" disabled>
+            </div>
+            <div  class="col-sm-4 form-group" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
+              <label for="f_collection" class="font_normal_body">收&emsp;&emsp;款</label>
+              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
+                     v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                     @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="!editCollection" v-el:paycode>
+            </div>
+          </div>
+
+          <div class="row" style="padding-top: 0.5em;">
+            <div class="col-sm-8">
+              <label for="f_comments" class="font_normal_body">备&emsp;&emsp;注</label>
+              <input class="input_search" style="width:87%" v-model="data.f_comments" placeholder="备注">
+            </div>
+          </div>
+        </form>
+        <validate-bill v-if="hasValidateBill" :data="data" @validate-bill="validateBill"></validate-bill>
+        <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="close" :data='data' @printok="printok" v-ref:printbill></print-bill>
+        <div class="text-right" style="margin-top: 1%">
+          <payment-code-button :clickable="!$v.valid || validateOk"
+                               :payment.sync="data.f_payment" :payment-data="paytype"
+                               @confirm-payment="confirm()">
+          </payment-code-button>
+          <button class="button_search btn-gn" @click="confirm()"  :disabled='!$v.valid || validateOk'>确认</button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+      <payment-code v-ref:paymentcode :payment="data.f_payment" :row="row" :money="data.f_after_discount"></payment-code>
+    </div>
+  </div>
+  <modal :show.sync="show" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header text-center">
+      <h4 class="modal-title">正在批量处理中, 请耐心等待...</h4>
+    </header>
+    <article slot="modal-body">
+      <div class="progress" style="margin: 20px">
+        <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: `${percent}%`}">
+          {{ percent }}
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+let asyncMachineMeterCenter = async function (self) {
+  await self.$getConfig(self, 'BatchCharge')
+  self.data.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  self.data.f_payment = [self.config.payment]
+  self.data.f_use_type = self.config.billType
+  self.data.f_bill_type = self.data.f_print
+  self.hasValidateBill = self.config.hasBillManage
+}
+export default {
+  name: 'BatchCharge',
+  title: '团体缴费',
+  data () {
+    return {
+      // 请求对象(批量导入,查询进度使用)
+      HttpReset: new HttpResetClass(),
+      timer: null,
+      config: {
+        showupload: true, // 显示上传
+        ceilCollcition: false, // 是否向上取整
+        hasPrint: true,  // 默认打票
+        postAsync: false,  // 是否异步请求  存完主记录再存明细
+        hasBillManage: false,  // 默认不启用发票管理
+        hasfindaReail: true,  // 默认开启找零功能
+        billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金缴费'
+      },
+      print: false,
+      billData: {
+        url: 'rs/report/charge_manage_group_bill',
+        bill: ''
+      },
+      paytype: this.$appdata.getParam('付款方式') ? this.$appdata.getParam('付款方式') : [],
+      printstyle: this.$appdata.getParam('打印格式') ? this.$appdata.getParam('打印格式') : [],
+      // 启用发票管理需要对票号进行验证
+      hasValidateBill: false,
+      validateOk: false,
+      editCollection: false,
+      // 收费进度
+      show: false,
+      percent: 0
+    }
+  },
+  props: ['data', 'owe', 'civill'],
+  beforeDestroy () {
+    // 销毁定时器
+    if (this.timer) clearInterval(this.timer)
+  },
+  ready () {
+    this.paycodefocus()
+    if (!this.$login.r.includes('免交充值付款')) {
+      this.paytype = this.paytype.filter((item) => {
+        return item.label != '免交'
+      })
+    }
+    this.editCollection = !!this.civill
+    this.data.f_collection = this.data.oughtfee_all - this.data.f_balance > 0 ? this.data.oughtfee_all - this.data.f_balance : 0
+    if (this.config.ceilCollcition) {
+      this.data.f_collection = Math.ceil(this.data.f_collection)
+    }
+    asyncMachineMeterCenter(this)
+  },
+  methods: {
+    paycodefocus () {
+      this.$nextTick(() => {
+        this.$els.paycode.focus()
+      })
+    },
+    /**
+     * 用来进行小数相加的工具方法
+     * @param {*} num1
+     * @param {*} num2
+     */
+    addNum (num1, num2) {
+      let sq1, sq2, multiple
+      try {
+        sq1 = num1.toString().split('.')[1].length
+      } catch (e) {
+        sq1 = 0
+      }
+      try {
+        sq2 = num2.toString().split('.')[1].length
+      } catch (e) {
+        sq2 = 0
+      }
+      multiple = Math.pow(10, Math.max(sq1, sq2) + 1)
+      return (num1 * multiple + num2 * multiple) / multiple
+    },
+    /**
+     * 用来进行小数相减的工具方法
+     * @param {*} num1
+     * @param {*} num2
+     */
+    subNum (num1, num2) {
+      let sq1, sq2, multiple
+      try {
+        sq1 = num1.toString().split('.')[1].length
+      } catch (e) {
+        sq1 = 0
+      }
+      try {
+        sq2 = num2.toString().split('.')[1].length
+      } catch (e) {
+        sq2 = 0
+      }
+      multiple = Math.pow(10, Math.max(sq1, sq2) + 1)
+      return (num1 * multiple - num2 * multiple) / multiple
+    },
+    confirm () {
+      // if (this.owe.rows.length <= 0) {
+      //   this.$showMessage('当前没有欠费！！')
+      //   return
+      // }
+      // 如果有变更原因说明有变更
+      if (this.data.f_collection < 0) {
+        this.$showMessage('收款金额不能小于零！！')
+        return
+      }
+      let inti = this.subNum(this.addNum(this.data.f_collection, this.data.f_balance), this.data.oughtfee_all)
+      if (inti < 0) {
+        this.$showMessage('收款金额不足以清缴欠费，请核查，并重新输入收款金额！！')
+        return
+      }
+      let msg = '确定进行批量收费吗？'
+      if (this.row) {
+      }
+      this.$showMessage(msg, ['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.machineChargeGen()
+        }
+      })
+    },
+    async machineChargeGen () {
+      let uuid = this.$login.guid()
+      let param = {
+        uuid: uuid,
+        chargeUser: [],
+        f_serial_id: this.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no,
+        f_balance: this.data.f_balance,
+        f_curbalance: this.curbalance,
+        f_pregas: this.data.oughtamount_all,
+        f_preamount: this.data.oughtfee_new_all,
+        f_delay: this.data.overdue_all,
+        f_delaypay: this.data.overdue_all,
+        f_collection: this.data.f_collection,
+        f_payment: this.data.f_payment[0],
+        f_print: this.data.f_print[0],
+        f_comments: this.data.f_comments,
+        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,
+          f_zoneid: this.$login.f.zoneid,
+          f_zones: this.$login.f.zones
+        }
+      }
+      for (let row of this.owe.rows) {
+        param.chargeUser.push({
+          f_userinfo_id: row.f_userinfo_id,
+          f_collection: row.f_oughtfee_all,
+          f_oughtfee: row.f_oughtfee,
+          f_oughtamount: row.f_oughtamount,
+          min_handplan_id: row.min_handplan_id,
+          max_handplan_id: row.max_handplan_id
+        })
+      }
+      if (this.civill) {
+        param = Object.assign(this.civill, param)
+      }
+      let batchId = ''
+      // 如果配置了异步请求
+      if (this.config.postAsync) {
+        // 插入主收费记录
+        let batch = await this.$resetpost('rs/logic/asyncbatchPaymentSellinggas', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        batchId = param.f_batch_id = batch.data.f_batch_id
+        // 处理记录明细抄表明细
+        // await this.$resetpost('rs/logic/async/asyncbatchPaymentFiles', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+      } else {
+        try {
+          await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
+        } catch (e) {}
+        // this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+        this.show = true
+        // 启动定时器定时查询处理结果
+        this.timer = setInterval(async () => {
+          let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
+          if (res.data.percent) {
+            this.percent = res.data.percent
+          }
+          if (res.data.msg || res.data.error) {
+            this.show = false
+            clearInterval(this.timer)
+            this.$closeMessage()
+            if (res.data.error) {
+              this.$showAlert(`${res.data.error}`, 'danger')
+              return
+            }
+            await this.$showMessage(res.data.msg)
+            batchId = res.data.id
+          }
+        }, 1500)
+      }
+      if (this.config.hasPrint) {
+        if (this.data.f_print.indexOf('电子发票') == -1) {
+          console.log('this.config.hasBillManage', this.config.hasBillManage)
+          if (this.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            this.row.id = batchId
+            this.row.f_bill_type = '物联网收费'
+            this.row.f_bill_style = this.model.f_print[0]
+            this.print = true
+          } else {
+            this.data.id = batchId
+            this.print = true
+          }
+        } else if (this.config.printType === '国税发票') {
+          // TODO
+        } else if (this.model.f_print[0] === '电子发票') {
+          this.eticket_show = true
+          await this.$refs.eticketbill.openETicket([batchId], this.row, this.invoice_show_gas, this.invoice_is_pax, '物联网收费')
+        }
+      } else {
+        this.clean()
+      }
+    },
+    clean () {
+      this.$dispatch('success')
+    },
+    validateBill (val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    },
+    printok () {
+      this.$dispatch('success')
+    },
+    close () {
+      this.print = false
+      this.clean()
+    }
+  },
+  watch: {
+  },
+  computed: {
+    curbalance () {
+      if (((this.data.f_collection - 0) + (this.data.f_balance - 0)) > (this.data.oughtfee_all - 0)) {
+        return ((this.data.f_collection - 0) + (this.data.f_balance - 0) - (this.data.oughtfee_all - 0)).toFixed(2)
+      } else {
+        return 0
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+
+</style>

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -147,13 +147,13 @@
           <template partial='foot'></template>
         </data-grid>
       </criteria-paged>
-      <print-data :sum-field="getfield" :model="printModel" :field="getfield" :printview="true"
-                  :defaultfield="defaultfield" titletable="团体欠费明细报表" v-ref:printdata>
+      <print-data :sum-field="getfield" :model="printModel" :thead="getHead" :field="getfield" :printview="true"
+                 :sumsmodel="{'f_oughtfee':printModel.sums.f_oughtfee}" :defaultfield="defaultfield" :titletable="getPrintname" v-ref:printdata>
       </print-data>
     </div>
 
     <export-excel
-      :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
+      :isshow="false" :data="getCondition" :footer="footer" :defaultselect="defaultselect"  :header="other" :field="getfield" :choose-col="true" v-ref:excel
       sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
     </export-excel>
 
@@ -173,6 +173,8 @@ export default {
       model: new PagedList('rs/sql/ncarchivesQuery', 20),
       // 公司下拉
       curorgid: [this.$login.f.orgid],
+      other:[],
+      footer:[],
       f_orgid: '',
       f_civill_id: null,
       oweShow: false,
@@ -185,22 +187,37 @@ export default {
           'f_user_name': '客户姓名',
           'f_address': '客户地址',
           'f_user_phone': '客户电话',
-          //'f_meter_classify': '气表类型',
-          //'c': '欠费期数',
+          'price': '气价',
           'f_hand_date': '欠费区间',
           'f_last_tablebase': '上期底数',
           'f_tablebase': '本期底数',
-          'price':'单价',
           'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额'
-          //'f_debt_money': '已交金额',
-          //'f_oughtfee_new': '应交气费',
-          //'overdue': '违约金',
-          //'f_oughtfee_all': '合计欠费'
         }
       },
-      defaultfield: [],
-      printModel: new PagedList('rs/sql/batchOweQuery', 20),
+    // excel默认导出列
+      defaultselect: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_address': '客户地址',
+        'price': '气价',
+        'f_last_tablebase': '上期底数',
+        'f_tablebase': '本期底数',
+        'f_oughtamount': '用气量',
+        'f_oughtfee': '用气金额'
+      },
+      // 打印默认导出列
+      defaultfield: [
+        'f_userinfo_code',
+        'f_user_name',
+        'f_address',
+        'price',
+        'f_last_tablebase',
+        'f_tablebase',
+        'f_oughtamount',
+        'f_oughtfee'
+      ],
+      printModel: new PagedList('rs/sql/batchOweQuery', 20,{},{f_oughtfee: 0}),
       row: null
     }
   },
@@ -233,6 +250,14 @@ export default {
   destroyed () {
     clearInterval(this.interval)
   },
+  computed: {
+    getPrintname(){
+      return `团缴欠费明细（${this.row.f_user_name}:${this.row.f_customer}）`
+    },
+    getHead () {
+      return `团缴号：${this.row.f_customer}`
+    }
+  },
   watch: {
     'oweShow' (val) {
       if (val) {
@@ -243,6 +268,26 @@ export default {
     }
   },
   methods: {
+    getotherfooter () {
+      // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+      // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+      this.other = [];
+      this.footer = [];
+      let otherInData = [];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+
+      // otherInData.push(``)
+      let footerData = [], exportfield = this.getfield
+      footerData.push("合计")
+      footerData.push(`用气金额:${this.row.f_oughtfee_all}`)
+      this.footer.push(footerData)
+      let date = []
+      date.push(`团缴名称:${this.row.f_user_name}`)
+      date.push(`团缴号:${this.row.f_customer}`)
+      this.other.push(date)
+      this.other.push(otherInData)
+
+    },
     async readCiTiaoCard () {
       console.log('读磁条卡，开始，不停的循环')
       let data = {}
@@ -284,12 +329,15 @@ export default {
     },
     // 打印
     async print (row) {
+      this.row = row
       let condition = `p.f_civill_id = ${row.id}`
       await this.printModel.search(condition)
       this.$refs.printdata.printData()
     },
     // 导出
     export (row) {
+      this.row = row
+      this.getotherfooter(row)
       this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
       this.$refs.excel.exportExcel()
     },

package/src/filiale/qianneng/sale.js

@@ -75,6 +75,8 @@ export default function () {
   Vue.component('user-base-info-new', (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfoNew'], resolve) })
   // 团体缴费查询列表
   Vue.component('charge-group-list', (resolve) => { require(['./chargeBatch/ChargeGroupList'], resolve) })
+  // 团体缴费查询列表
+  Vue.component('batch-charge', (resolve) => { require(['./chargeBatch/BatchCharge'], resolve) })
   // 选中用户的欠费信息
   Vue.component('owe-record-query', (resolve) => { require(['./chargeBatch/OweRecordQuery'], resolve) })
   // 再装表

package/src/filiale/wenxi/CardService.js

@@ -631,7 +631,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
         getCardNumber.data.cardNumber = row.f_card_id
         console.log('档案自带卡号、、', getCardNumber)
       }
-      if (row.f_alias && row.f_alias.includes('SmartCard_TP')) {
+      if (row.f_alias && (row.f_alias.includes('SmartCard_TP') || row.f_alias.includes('LiHengSystem'))) {
         model.cardNumber = row.f_meternumber
       } else if (getCardNumber.data.cardNumber) {
         model.cardNumber = getCardNumber.data.cardNumber + ''
@@ -739,7 +739,7 @@ let resetsendCardSaleGasGen = async function (model, row) {
       if (getCardNumber.data.cardNumber) {
         // 当卡的别名是泰鹏普通卡的时候卡号和表号一致
         console.log('开始验证是不是泰鹏普通卡')
-        if (row.f_alias && row.f_alias.includes('SmartCard_TP')) {
+        if (row.f_alias && (row.f_alias.includes('SmartCard_TP') || row.f_alias.includes('LiHengSystem'))) {
           model.cardNumber = row.f_meternumber
         } else {
           model.cardNumber = getCardNumber.data.cardNumber + ''
@@ -842,7 +842,7 @@ let sendCardSaleGasGen = async function (model, row) {
       if (getCardNumber.data.cardNumber) {
         // 当卡的别名是泰鹏普通卡的时候卡号和表号一致
         console.log('开始验证是不是泰鹏普通卡')
-        if (row.f_alias && row.f_alias.includes('SmartCard_TP')) {
+        if (row.f_alias && (row.f_alias.includes('SmartCard_TP') || row.f_alias.includes('LiHengSystem'))) {
           model.cardNumber = row.f_meternumber
         } else if (row.f_alias && row.f_alias.includes('LaiDeRF')) {
           model.cardNumber = row.f_card_id

package/src/filiale/wenxi/UserDeviceInfoTest.vue

@@ -14,8 +14,9 @@
                 <a style="font-size: 16px;font-weight: 500;">设备基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
               </div>
               <div class="row auto" style="margin-top: 10px;margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;">
-                  <label class="font_normal_body">设备类型</label>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_devices_type ? 'has-error' : '']">
+                  <label class="font_normal_body">*设备类型</label>
+                  <input type="text" v-show="false" v-model="row.f_devices_type" required="true"/>
                   <v-select :value.sync="row.f_devices_type" v-model="row.f_devices_type"
                             :options='devicetypes' placeholder='设备类型' :value-single="true"
                             close-on-select></v-select>
@@ -27,9 +28,10 @@
                 </div>
               </div>
               <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_brand && (row.f_devices_type == '壁挂炉' || row.f_devices_type == '热水器') ? 'has-error' : '']">
-                  <label class="font_normal_body">设备品牌</label>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_brand ? 'has-error' : '']">
+                  <label class="font_normal_body">*设备品牌</label>
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌'
+                         required="true"
                          v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
@@ -62,8 +64,9 @@
                             :options='installperson' placeholder='安装人'
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[row.f_devices_type == '壁挂炉' && row.f_input_date == '' ? 'has-error' : '']">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[ row.f_input_date == '' ? 'has-error' : '']">
                   <label class="font_normal_body">安装日期</label>
+                  <input type="text" v-show="false" v-model="row.f_input_date" required="true"/>
                   <datepicker placeholder="安装日期" style="width: 60%"
                               v-model="row.f_input_date"
                               :value.sync="row.f_input_date"
@@ -95,10 +98,11 @@
                          :value.sync="row.f_expire_date"
                          placeholder="到期日期"  disabled></input>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_devices_num ? 'has-error' : '']">
                   <label class="font_normal_body">设备数量</label>
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_num"
                          :value.sync="row.f_devices_num"
+                         required="true"
                          placeholder='设备数量' :id="$index+'devicesmodel'">
                 </div>
               </div>
@@ -133,8 +137,9 @@
               <a style="font-size: 16px;font-weight: 500;">连接管信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
             </div>
               <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-8 form-group" style="padding-right: 5px;">
-                  <label class="font_normal_body">有无不锈钢波纹管</label>
+                <div class="col-sm-8 form-group" style="padding-right: 5px;" :class="[!row.f_pipe_type ? 'has-error' : '']">
+                  <label class="font_normal_body">*有无不锈钢波纹管</label>
+                  <input type="text" v-show="false" v-model="row.f_pipe_type" required="true"/>
                   <v-select  :value.sync="row.f_pipe_type" v-model="row.f_pipe_type"
                             :options='pipetypes' placeholder='有无不锈钢波纹管' :value-single="true"
                             close-on-select></v-select>
@@ -163,8 +168,9 @@
                 </div>
               </div>
               <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="devicesinfoShow">
-                  <label class="font_normal_body">有无自闭阀</label>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="devicesinfoShow" :class="[!row.f_is_zibifa ? 'has-error' : '']">
+                  <label class="font_normal_body">*有无自闭阀</label>
+                  <input type="text" v-show="false" v-model="row.f_is_zibifa" required="true"/>
                   <v-select :value.sync="row.f_is_zibifa" v-model="row.f_is_zibifa"
                             :options='is_zibifa' placeholder='有无自闭阀' :value-single="true"
                             close-on-select></v-select>
@@ -350,6 +356,10 @@ export default {
       let cannotclose = false
       let deleteData = []
       for (let [index, row] of this.devicesinfo.entries()) {
+        if (!row.f_devices_type || !row.f_brand || !row.f_input_date || !row.f_devices_num || !row.f_is_zibifa || !row.f_zibifa_num || !row.f_pipe_type || !row.f_pipe_num) {
+          deleteData.push(index)
+          cannotclose = true
+        }
         switch (row.f_devices_type) {
           case '壁挂炉':
             if (!(row.f_brand && row.f_input_date)) {

package/src/filiale/wuhai/EticketModal.vue

@@ -0,0 +1,165 @@
+<template>
+  <div class="auto form-horizontal">
+    <modal :show.sync="show" v-ref:modal large backdrop="false" :width="900">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeShow"><span>&times;</span></button>
+        <h4 class="modal-title">发票信息</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="auto select-overspread form-horizontal">
+          <div class="row pt-20">
+            <button id="one" class="btn btn-click" @click="switchTab(0)"><strong>个人</strong></button>
+            <button id="tow" class="btn btn-click" @click="switchTab(1)"><strong>企业</strong></button>
+          </div>
+          <div class="row auto" v-show="tabIndex===0">
+            <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
+              <label class="control-label">开票名称:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_paper_name" placeholder="开票名称">
+            </div>
+            <!--                <div class="col-sm-6 form-group form-input-group">-->
+            <!--                  <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>-->
+            <!--                  <v-select v-model="row.invoice_is_pax"-->
+            <!--                            placeholder='请选择'-->
+            <!--                            :value.sync="row.invoice_is_pax"-->
+            <!--                            close-on-select-->
+            <!--                            :width="60" disabled-->
+            <!--                            :value-single="true"-->
+            <!--                            :search="false"-->
+            <!--                            :options='is_pax' clear-button>-->
+            <!--                  </v-select>-->
+            <!--                </div>-->
+            <div class="col-sm-12 form-group form-input-group">
+              <label class="control-label">开户行及账号:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_paper_account" placeholder="购方开户行及账号">
+            </div>
+            <div class="col-sm-12 form-group form-input-group"
+                 :class="[ row.f_taxpayer_id.length<16 || row.f_taxpayer_id.length>18 ? 'has-error' : '']">
+              <label class="control-label">身份证号:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_taxpayer_id" placeholder="纳税人识别号(16至18位)">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+              <label class="control-label">开票地址电话:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_address_phone" placeholder="开票地址">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" >
+              <label class="control-label">发票备注:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_eticket_reason" placeholder="发票备注">
+            </div>
+            <div class="col-sm-12 form-group form-input-group">
+              <label class="control-label">邮箱推送:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_email" placeholder="邮箱推送">
+            </div>
+          </div>
+          <div class="row auto" v-show="tabIndex===1">
+            <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
+              <label class="control-label">开票名称:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_paper_name" placeholder="开票名称">
+            </div>
+            <div class="col-sm-6 form-group form-input-group">
+              <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+              <v-select v-model="row.invoice_is_pax"
+                        placeholder='请选择'
+                        :value.sync="row.invoice_is_pax"
+                        close-on-select
+                        :width="60" disabled
+                        :value-single="true"
+                        :search="false"
+                        :options='is_pax' clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-12 form-group form-input-group">
+              <label class="control-label">开户行及账号:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_paper_account" placeholder="购方开户行及账号">
+            </div>
+            <div class="col-sm-12 form-group form-input-group"
+                 :class="[ row.f_taxpayer_id.length<16 || row.f_taxpayer_id.length>18 ? 'has-error' : '']">
+              <label class="control-label">纳税人识别号:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_taxpayer_id" placeholder="纳税人识别号(16至18位)">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+              <label class="control-label">开票地址电话:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_address_phone" placeholder="开票地址">
+            </div>
+            <div class="col-sm-12 form-group form-input-group" >
+              <label class="control-label">发票备注:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_eticket_reason" placeholder="发票备注">
+            </div>
+            <div class="col-sm-12 form-group form-input-group">
+              <label class="control-label">邮箱推送:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_email" placeholder="邮箱推送">
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn button_search"
+                :disabled="!(row.f_paper_name&&row.f_address_phone&&row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18)"
+                @click='confirm'>确认收费
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+export default {
+  title: '电子发票',
+  data () {
+    return {
+      is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+      tabIndex: 0
+    }
+  },
+  props: ['row','show'],
+  ready () {
+    document.getElementById('one').style.backgroundColor = '#6aa6e2'
+    document.getElementById('one').style.color = 'white'
+  },
+  methods: {
+    switchTab (param) {
+      this.tabIndex = param
+      if (param === 0) {
+        if (document.getElementById('one')) {
+          document.getElementById('one').style.backgroundColor = '#6aa6e2'
+          document.getElementById('one').style.color = 'white'
+          document.getElementById('tow').style.backgroundColor = 'white'
+          document.getElementById('tow').style.color = 'black'
+        }
+      } else {
+        if (document.getElementById('tow')) {
+          document.getElementById('tow').style.backgroundColor = '#6aa6e2'
+          document.getElementById('tow').style.color = 'white'
+          document.getElementById('one').style.backgroundColor = 'white'
+          document.getElementById('one').style.color = 'black'
+        }
+      }
+    },
+    confirm () {
+      this.$dispatch('confirm')
+    },
+    closeShow () {
+      this.$dispatch('closemodalshow')
+    }
+  },
+  watch: {
+    'row' () {
+      this.row.invoice_is_pax = ['征税']
+    }
+  },
+  events: {}
+}
+</script>
+<style>
+</style>

package/src/filiale/wuhai/sale.js

@@ -29,4 +29,6 @@ export default function () {
   Vue.component('no-card-meter-center', (resolve) => { require(['./NoCardMeterCenter'], resolve) })
   // 无卡收费
   Vue.component('other-gas', (resolve) => { require(['./OtherGas'], resolve) })
+  // 发票信息公共
+  Vue.component('eticket-modal', (resolve) => { require(['./EticketModal'], resolve) })
 }