sale-client 3.6.8 → 3.6.9

package/package.json

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

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -127,10 +127,14 @@
         </div>
       </div>
       <div v-if="row.f_collection_type == '按气量'" >
-        <div  class="col-sm-4">
+        <div  class="col-sm-4" v-if="!row.f_calculation.includes('表端结算')">
           <label class="font_normal_body_new">表剩余气量</label>
           <input class="input-underline" style="width:55%" :value="row.f_balance_gas" readonly>
         </div>
+        <div  class="col-sm-4" v-if="row.f_meter_type.includes('表端结算')">
+          <label class="font_normal_body_new">表剩余气量</label>
+          <input class="input-underline" style="width:55%" :value="row.f_jval" readonly>
+        </div>
         <div  class="col-sm-4">
           <label class="font_normal_body_new">累计用气金额</label>
           <input class="input-underline" style="width:45%" :value="row.f_total_usegas_amount" readonly>

package/src/components/revenue/Common/uploadFiles.vue

@@ -73,11 +73,11 @@
         this.showhighmeter = !this.showhighmeter
       },
       async load (self) {
-        let condition = `f_blobid= '${self.headers.blodid}' `
+        let condition = `1=1 and f_blobid= '${self.headers.blodid}' `
         if (this.fusetype) {
           condition += ` and fusetype='${this.fusetype}'`
         }
-        let getFile = await this.$resetpost('rs/sql/singleTable', {
+        let getFile = await this.$resetpost('rs/sql/saleSingleTable', {
           data: {
             tablename: 't_files',
             condition: condition + ` order by f_uploaddate desc `

package/src/filiale/shanxian/UserDeviceInfoTest.vue

@@ -301,7 +301,7 @@ export default {
       pipeways: this.$appdata.getParam('连接方式'),
       pipetypeparams: this.$appdata.getParam('管道类型'),
       WatchPurchases: this.$appdata.getParam('购买方式'),
-      installperson: this.$appdata.getParam('安装人'),
+      installperson: [{label: '无', value: ''}, ...this.$appdata.getParam('安装人')],
       installtype: this.$appdata.getParam('安装方式'),
       userdevicestate: this.$appdata.getParam('用户设备状态'),
       builders: this.$appdata.getParam('施工单位'),

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -0,0 +1,393 @@
+<template>
+  <div class="auto form-horizontal">
+    <modal :show.sync="show" v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">收费电子发票</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="row" style="display: flex;justify-content: center;" v-if="!eticket_src">
+          {{ return_msg }}
+        </div>
+        <iframe :src="eticket_src" v-if="eticket_src" width="100%" height="500px">
+        </iframe>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click="cancel">{{ '关闭' }}</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '电子发票',
+  data () {
+    return {
+      eticket_src: '',
+      return_msg: '航信收到开票请求，正在查询开票状态，请稍后',
+      show: true
+    }
+  },
+  props: ['show'],
+  ready () {
+  },
+  methods: {
+    cancel () {
+      console.log('电子哈哈哈，你走了没')
+      this.eticket_src = ''
+      this.return_msg = '正在查询中，请稍后'
+      this.$dispatch('toggle')
+    },
+    //* 公用保存信息接口
+    async save_msg (obj) {
+      let model = {
+        id: obj.f_eticket_id,
+        f_bill_code: obj.f_bill_code ? obj.f_bill_code : undefined,
+        f_bill_number: obj.f_bill_number ? obj.f_bill_number : undefined,
+        f_jym: obj.f_jym ? obj.f_jym : undefined,
+        f_bill_url: obj.f_bill_url ? obj.f_bill_url : undefined,
+        f_red_url: obj.f_red_url ? obj.f_red_url : undefined,
+        f_bill_state: obj.f_bill_state,
+        f_sign_result: obj.f_sign_result ? obj.f_sign_result : undefined,
+        f_sign_time: obj.f_sign_time ? obj.f_sign_time : undefined
+      }
+      await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
+    },
+    async openETicket (sellId, row, show_gas, is_pax, type) {
+      try {
+        let model = {
+          id: sellId,
+          f_charge_type: type,
+          f_dept_id: this.$login.f.depids,
+          f_operator: this.$login.f.name,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depname: this.$login.f.deps,
+          f_operatorid: this.$login.f.id,
+          f_filialeids: this.$login.f.f_orgids,
+          f_buy_name: row.f_paper_name,
+          f_pay_id: row.f_taxpayer_id,
+          f_buy_address: row.f_address_phone,
+          f_mail_push: row.f_email,
+          f_buy_openbank: row.f_paper_account,
+          invoice_show_gas: show_gas === '是',
+          is_pax: is_pax === '征税'
+        }
+        console.log('组织开票数据并保存', model)
+        // TODO 组织开票数据并保存
+        let ticket_id = await this.$resetpost('rs/logic/TCcombineData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
+        return this.openEticketGen(ticket_id.data)
+      } catch (error) {
+        this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
+      }
+    },
+    async openCustETicket (custModel, invoice_is_pax) {
+      try {
+        let model = Object.assign({
+          f_dept_id: this.$login.f.depids,
+          f_operator: this.$login.f.name,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depname: this.$login.f.deps,
+          f_operatorid: this.$login.f.id,
+          f_filialeids: this.$login.f.f_orgids,
+          f_buy_name: custModel.f_paper_name,
+          f_pay_id: custModel.f_taxpayer_id,
+          f_buy_address: custModel.f_address_phone,
+          f_mail_push: custModel.f_email,
+          f_buy_openbank: custModel.f_paper_account,
+          invoice_show_gas: !!(custModel.amount && custModel.price),
+          detail_price: {amount: custModel.amount, price: custModel.price, name: custModel.name, money: custModel.money},
+          is_pax: invoice_is_pax === '征税'
+        }, custModel)
+        // TODO 组织开票数据并保存
+        let ticket_id = await this.$resetpost('rs/logic/TCcombineCustData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
+        return this.openEticketGen(ticket_id.data)
+      } catch (error) {
+        this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
+      }
+    },
+    /**
+     * src赋值 外部调用
+     *  */
+    watch_ch (src) {
+      this.eticket_src = src
+    },
+    /**
+     * 电票查询 外部调用
+     * */
+    fp_search (row, ticket_id) {
+      // 通过收费记录id查询
+      let http = new HttpResetClass()
+      http.load('POST', '/invoice/rs/tongchuan/queryInvoice', {eticket_id: ticket_id}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((req) => {
+        if (!req.data.RESPONSE_FPXXXZ) {
+          this.$showAlert('电子票查询出错,暂无错误信息.请联系管理员', 'danger', 5000)
+          return
+        }
+        req = req.data.RESPONSE_FPXXXZ
+        let model
+        if (req.RETURN_CODE === '0000') {
+          if (req.PDF_URL) {
+            model = {
+              id: ticket_id,
+              f_bill_code: req.FPDM,
+              f_bill_number: req.FPHM,
+              f_jym: req.INVOICE_CHECK_CODE,
+              f_bill_url: req.PDF_URL,
+              f_bill_state: '开票成功',
+              f_sign_result: req.RETURN_MESSAGE
+            }
+            this.eticket_src = req.PDF_URL
+          } else if (req.PDF_RED_URL) {
+            model = {
+              id: ticket_id,
+              f_bill_code: req.FPDM,
+              f_bill_number: req.FPHM,
+              f_jym: req.INVOICE_CHECK_CODE,
+              f_red_url: req.PDF_RED_URL,
+              f_bill_state: '冲红',
+              f_sign_result: req.RETURN_MESSAGE
+            }
+            this.eticket_src = req.PDF_RED_URL
+          }
+        } else if (req.RETURN_CODE === '0011') {
+          model = {
+            id: ticket_id,
+            f_bill_state: '等待查询',
+            f_sign_result: req.RETURN_MESSAGE
+          }
+          this.return_msg = '请稍后再试。' + req.RETURN_MESSAGE
+        } else {
+          model = {
+            id: row.id,
+            f_bill_state: '开票失败',
+            f_sign_result: req.RETURN_MESSAGE
+          }
+          this.return_msg = ' 开票失败。' + req.RETURN_MESSAGE
+        }
+        this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'}).then(
+          res => this.$dispatch('search')
+        )
+      })
+    },
+    /** 冲红
+     * */
+    async rushRedInvoice (ticket_id) {
+      try {
+          // 否则正常打票
+        let time = 0
+        let result = await this.$resetpost('/invoice/rs/tongchuan/rushRed', {eticket_id: ticket_id}, {
+          resolveMsg: null,
+          rejectMsg: '发票冲红失败!!'
+        })
+        result = result.data.RESPONSE_FPXX
+        if (result && result.RETURN_CODE === '0000') {
+        // TODO 开票成功 保存发票详情
+          await this.save_msg({
+            f_eticket_id: ticket_id,
+            f_bill_state: '等待查询'
+          })
+        // TODO 开票成功 进行查询
+          let interval = await setInterval(() => {
+          // 2秒一轮回
+            let http = new HttpResetClass()
+            http.load('POST', '/invoice/rs/tongchuan/queryInvoice', {eticket_id: ticket_id}, {
+              resolveMsg: null,
+              rejectMsg: null
+            }).then(req => {
+              if (!req.data.RESPONSE_FPXXXZ) {
+                clearInterval(interval)
+                this.save_msg({
+                  f_eticket_id: ticket_id,
+                  f_sign_result: '查询超时请再次尝试。',
+                  f_bill_state: '查询失败'
+                })
+                this.$showAlert('电子票查询出错,暂无错误信息,请前往发票管理重新尝试', 'danger', 5000)
+                return
+              }
+              req = req.data.RESPONSE_FPXXXZ
+              console.log(req, '查出什么玩意了', time, req.DDBH + '')
+              if (req && req.RETURN_CODE === '0000') {
+              // 组织数据
+                clearInterval(interval)
+              // TODO 成功后保存发票详情
+                this.save_msg({
+                  f_eticket_id: ticket_id,
+                  f_bill_code: req.FPDM,
+                  f_bill_number: req.FPHM,
+                  f_jym: req.INVOICE_CHECK_CODE,
+                  f_bill_url: req.PDF_RED_URL,
+                  f_sign_result: req.RETURN_MESSAGE,
+                  f_bill_state: '冲红'
+                })
+                this.eticket_src = req.PDF_RED_URL
+              } else if (req && req.RETURN_CODE !== '0011') {
+                clearInterval(interval)
+              // TODO 失败后保存发票详情
+                this.save_msg({
+                  f_eticket_id: ticket_id,
+                  f_sign_result: req.RETURN_MESSAGE,
+                  f_bill_state: '开票成功'
+                })
+                this.return_msg = '电子票查询出错,错误【' + req.RETURN_MESSAGE + '】,错误代码【' + req.RETURN_CODE + '】,请前往发票管理重新尝试'
+              } else {
+                if (time == 80) {
+                // 三十秒后无效
+                // TODO 查询失败后保存发票详情
+                  this.save_msg({
+                    f_eticket_id: ticket_id,
+                    f_sign_result: '查询超时请再次尝试。',
+                    f_bill_state: '等待查询'
+                  })
+                  this.return_msg = '发票已经开具,查询发票状态超时,请前往发票管理重新尝试'
+                  clearInterval(interval)
+                }
+                time = time + 1
+              }
+            })
+          }, 1 * 2000)
+        } else if (result) {
+        // TODO 查询失败后保存发票详情
+          await this.save_msg({
+            f_eticket_id: ticket_id,
+            f_sign_result: result.RETURN_MESSAGE,
+            f_bill_state: '冲红失败'
+          })
+          this.return_msg = '电子票冲红出错,错误【' + result.RETURN_MESSAGE + '】,错误代码【' + result.RETURN_CODE + '】,请前往发票管理重新尝试'
+        } else {
+          await this.save_msg({
+            f_eticket_id: ticket_id,
+            f_sign_result: '电子票冲红出错,需要查询日志。',
+            f_bill_state: '冲红失败'
+          })
+          this.$showAlert('电子票冲红出错,暂无错误信息,请前往发票管理重新尝试', 'danger', 5000)
+        }
+      } catch (error) {
+        await this.save_msg({
+          f_eticket_id: ticket_id,
+          f_return_msg: '冲红失败,需要查询日志。',
+          f_bill_state: '冲红失败'
+        })
+        this.$showAlert('电子票冲红出现异常，请联系管理员！！！', 'warning', 5000)
+      }
+    },
+    /**
+     *
+     * @param id 收费id
+     * @param ticket_id 票据信息 id
+     * @returns {Promise<void>}  如果查到返回url
+     */
+    async openEticketGen (ticket_id) {
+      try {
+        // 否则正常打票
+        await this.$resetpost('/rs/logic/updateSearil', {id: ticket_id}, {
+          resolveMsg: null,
+          rejectMsg: '更新流水号失败!!'
+        })
+        let time = 0
+        let result = await this.$resetpost('/invoice/rs/tongchuan/getInvoice', {eticket_id: ticket_id}, {
+          resolveMsg: null,
+          rejectMsg: '发票打印失败!!'
+        })
+        result = result.data.RESPONSE_FPXX
+        if (result && result.RETURN_CODE === '0000') {
+          // TODO 开票成功 保存发票详情
+          await this.save_msg({
+            f_eticket_id: ticket_id,
+            f_bill_state: '等待查询'
+          })
+          // TODO 开票成功 进行查询
+          let interval = await setInterval(() => {
+            // 2秒一轮回
+            let http = new HttpResetClass()
+            http.load('POST', '/invoice/rs/tongchuan/queryInvoice', {eticket_id: ticket_id}, {
+              resolveMsg: null,
+              rejectMsg: null
+            }).then(req => {
+              if (!req.data.RESPONSE_FPXXXZ) {
+                clearInterval(interval)
+                this.save_msg({
+                  f_eticket_id: ticket_id,
+                  f_sign_result: '查询超时请再次尝试。',
+                  f_bill_state: '查询失败'
+                })
+                this.$showAlert('电子票查询出错,暂无错误信息,请前往发票管理重新尝试', 'danger', 5000)
+                return
+              }
+              req = req.data.RESPONSE_FPXXXZ
+              console.log(req, '查出什么玩意了', time, req.DDBH + '')
+              if (req && req.RETURN_CODE === '0000') {
+                // 组织数据
+                clearInterval(interval)
+                // TODO 成功后保存发票详情
+                this.save_msg({
+                  f_eticket_id: ticket_id,
+                  f_bill_code: req.FPDM,
+                  f_bill_number: req.FPHM,
+                  f_jym: req.INVOICE_CHECK_CODE,
+                  f_bill_url: req.PDF_URL,
+                  f_sign_result: req.RETURN_MESSAGE,
+                  f_bill_state: '开票成功'
+                })
+                this.eticket_src = req.PDF_URL
+              } else if (req && req.RETURN_CODE !== '0011') {
+                clearInterval(interval)
+                // TODO 失败后保存发票详情
+                this.save_msg({
+                  f_eticket_id: ticket_id,
+                  f_sign_result: req.RETURN_MESSAGE,
+                  f_bill_state: '开票失败'
+                })
+                this.return_msg = '电子票查询出错,错误【' + req.RETURN_MESSAGE + '】,错误代码【' + req.RETURN_CODE + '】,请前往发票管理重新尝试'
+              } else {
+                if (time == 50) {
+                  // 三十秒后无效
+                  // TODO 查询失败后保存发票详情
+                  this.save_msg({
+                    f_eticket_id: ticket_id,
+                    f_sign_result: '查询超时请再次尝试。',
+                    f_bill_state: '查询失败'
+                  })
+                  this.return_msg = '发票已经开具,查询发票状态超时,请前往发票管理重新尝试'
+                  clearInterval(interval)
+                }
+                time = time + 1
+              }
+            })
+          }, 1 * 2000)
+        } else if (result) {
+          // TODO 查询失败后保存发票详情
+          await this.save_msg({
+            f_eticket_id: ticket_id,
+            f_sign_result: result.RETURN_MASSAGE,
+            f_bill_state: '开票失败'
+          })
+          this.return_msg = '电子票开票出错,错误【' + result.RETURN_MASSAGE + '】,错误代码【' + result.RETURN_CODE + '】,请前往发票管理重新尝试'
+        } else {
+          await this.save_msg({
+            f_eticket_id: ticket_id,
+            f_sign_result: '开票失败,需要查询日志。',
+            f_bill_state: '开票失败'
+          })
+          this.$showAlert('电子票开票出错,暂无错误信息,请前往发票管理重新尝试', 'danger', 5000)
+        }
+      } catch (error) {
+        await this.save_msg({
+          f_eticket_id: ticket_id,
+          f_return_msg: '开票失败,需要查询日志。',
+          f_bill_state: '开票失败'
+        })
+        this.$showAlert('电子发票打印出现异常，请联系管理员！！！', 'warning', 5000)
+      }
+    }
+  },
+  watch: {},
+  events: {}
+}
+</script>
+<style>
+</style>

package/src/filiale/tongchuan/sale.js

@@ -125,6 +125,7 @@ export default function () {
   // 抄表列表
   Vue.component('hand-list', (resolve) => { require(['./handList'], resolve) })
   Vue.component('e-ticket-open-hand', (resolve) => { require(['./EticketOpenJBPage.vue'], resolve) })
+  Vue.component('ticket-print', (resolve) => { require(['./bill/EticketPrint'], resolve) })
 
   // 表计管理
   Vue.component('web-meter-info', (resolve) => { require(['./WebMeterInfo'], resolve) })

package/src/main.js

@@ -1,27 +1,27 @@
-import Vue from 'vue'
-import all from 'vue-client/src/all'
-import App from './App'
-import system from 'system-clients/src/system'
-import sale from './sale'
-import wenxi from './filiale/lixianV3/sale'
-// import FilialeSale from './filiale/yuansheng/sale'
-import address from 'address-client/src/address'
-import ldap from 'ldap-clients/src/ldap'
-import VueClipboard from 'vue-clipboard2'
-
-Vue.use(VueClipboard)
-Vue.config.silent = true
-
-all()
-system(false)
-sale()
-wenxi()
-// FilialeSale()
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import all from 'vue-client/src/all'
+import App from './App'
+import system from 'system-clients/src/system'
+import sale from './sale'
+import wenxi from './filiale/lixianV3/sale'
+// import FilialeSale from './filiale/yuansheng/sale'
+import address from 'address-client/src/address'
+import ldap from 'ldap-clients/src/ldap'
+import VueClipboard from 'vue-clipboard2'
+
+Vue.use(VueClipboard)
+Vue.config.silent = true
+
+all()
+system(false)
+sale()
+wenxi()
+// FilialeSale()
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})