sale-client 3.6.289 → 3.6.290

package/build/versionCheck.js

@@ -1,25 +1,26 @@
-function isVersionGreaterThan(version1, version2) {
+function isVersionGreaterThan (version1, version2) {
   const v1parts = version1.split('.')
   const v2parts = version2.split('.')
-
+  let flag = false
   for (let i = 0; i < v1parts.length; ++i) {
-    if (v2parts.length === i) {
-      return true
+    if (v1parts[i] > v2parts[i]) {
+      flag = true
+      break
     }
-    return v1parts[i] >= v2parts[i]
   }
 
-  return v1parts.length !== v2parts.length
+  return flag
 }
 
 const pkg = require('../package.json')
 const checkVersion = () => {
   const {devDependencies} = pkg
   if (devDependencies && devDependencies['system-clients']) {
-    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.93')) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请查看营收后台升级日志：http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
     }
   }

package/package.json

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

package/src/filiale/macheng/HandManager.vue

@@ -696,12 +696,12 @@
           'f_user_name': '客户姓名',
           'f_residential_area': '小区名称',
           'f_address': '客户地址',
-          'f_zones' : '片区',
+          'f_zones': '片区',
           'f_user_phone': '客户电话',
           'f_meternumber': '表号',
           'f_meter_base': '上期底数',
           'avggas': '平均用气量',
-          'f_adjustable_name': '本期底数'
+          'f_table_base': '本期底数'
         },
         config: {
           // 导出列要和查询列相同
@@ -716,7 +716,7 @@
             'f_meternumber': '表号',
             'avggas': '平均用气量',
             'f_meter_base': '上期底数',
-            'f_adjustable_name': '本期底数',
+            'f_table_base': '本期底数',
             'f_inputtor': '抄表员',
             'f_balacne': '上期结余',
             'f_last_input_date': '上次抄表',

package/src/filiale/rongchuang/CardMeterCenter.vue

@@ -172,8 +172,6 @@
               <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-8">
               <label for="f_comments" class="font_normal_body">&nbsp;备&emsp;&emsp;注</label>
               <input class="input_search" style="width:77%" v-model="model.f_comments" rows="1" placeholder="备注">
@@ -213,7 +211,7 @@
   </div>
   <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
   <eticket-modal :show="eticket_msg" :row="row" @confirm="confirm"></eticket-modal>
-  <eticket-print-async  :show="eticket_show" @toggle="eticket_toggle"  v-ref:asynceticket></eticket-print-async>
+  <ticket-print :show="eticket_show" @toggle="eticket_toggle"  v-ref:asynceticket></ticket-print>
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
@@ -334,7 +332,7 @@
       await self.$resetpost('rs/logic/updatefiles', data)
       // 开始打票
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-        if (self.model.f_print.indexOf('电子发票') == -1) {
+        if (!['电子发票', '数电普票', '数电专票'].includes(self.model.f_print[0])) {
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
             self.row.id = res
@@ -346,9 +344,39 @@
             self.print = true
           }
         } else {
-          if (self.model.f_print[0] === '电子发票') {
-            self.eticket_show=true
-            await self.$refs.asynceticket.openEticket(res, self.row,'卡表收费')
+          if (['电子发票', '数电普票', '数电专票'].includes(self.model.f_print[0])) {
+            // self.eticket_show = true
+            self.$refs.asynceticket.openETicketNoModal(res, self.row, '卡表收费').then(
+              (_res) => {
+                if (self.config.hasBillManage) {
+                  // 启用发票管理，获取票据管理中的票号并存储记录
+                  self.row.id = res
+                  self.row.f_bill_type = '卡表收费'
+                  self.row.f_bill_style = self.model.f_print[0]
+                  self.print = true
+                } else {
+                  self.row.id = res
+                  self.print = true
+                }
+              }
+            ).catch((error) => {
+              console.log('捕获到异常', error)
+              if (error instanceof Object) {
+                self.$showAlert(error.data, 'danger', 0)
+              } else {
+                self.$showAlert('收费成功,电子票开具失败，' + error + '，请在自定义开票页面补开发票。', 'danger', 0)
+              }
+              if (self.config.hasBillManage) {
+                // 启用发票管理，获取票据管理中的票号并存储记录
+                self.row.id = res
+                self.row.f_bill_type = '卡表收费'
+                self.row.f_bill_style = self.model.f_print[0]
+                self.print = true
+              } else {
+                self.row.id = res
+                self.print = true
+              }
+            })
           }
         }
       } else {
@@ -372,10 +400,10 @@
     console.log('卡表收费config', self.config)
     console.log('row', self.row)
     // 默认打印格式
-    if(self.row.f_paper_type){
-      self.model.f_print=self.row.f_paper_type instanceof Array  ? self.row.f_paper_type : [self.row.f_paper_type ]
-    }else{
-      self.model.f_print = self.config.printType instanceof Array  ? self.config.printType : [self.config.printType]
+    if (self.row.f_paper_type) {
+      self.model.f_print = self.row.f_paper_type instanceof Array ? self.row.f_paper_type : [self.row.f_paper_type ]
+    } else {
+      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     }
     // self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
@@ -416,16 +444,16 @@
       }
     }
     let nowrite_param = {
-      f_userfiles_id: self.row.f_userfiles_id,
+      f_userfiles_id: self.row.f_userfiles_id
     }
     let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
       resolveMsg: null,
       rejectMsg: '获取限购值失败！！'
     })
-    if(getNoWriteCard.data.length >0){
+    if (getNoWriteCard.data.length > 0) {
       self.$showMessage(`三小时内存在写卡失败的记录，是否重新写卡？`, ['confirm', 'cancel']).then(async (res) => {
         if (res === 'confirm') {
-          let url = 'http://127.0.0.1:8003/'+ getNoWriteCard.data[0].f_cardpost
+          let url = 'http://127.0.0.1:8003/' + getNoWriteCard.data[0].f_cardpost
           let param = JSON.parse(getNoWriteCard.data[0].f_cardparam)
           let cardRes = await self.$resetpost(url, param, {resolveMsg: null, rejectMsg: '重新写卡失败'})
           if (cardRes.data.Err || cardRes.data.Exception) {
@@ -435,19 +463,18 @@
             self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
             self.$dispatch('success')
           }
-        }else{
+        } else {
           self.$dispatch('refresh', self.row)
         }
       })
     }
-
   }
   export default {
     title: '卡表收费',
     data () {
       return {
-        //发票相关
-        eticket_msg:false,
+        // 发票相关
+        eticket_msg: false,
         eticket_show: false,
         mjshow: false,
         serialShow: false,
@@ -592,13 +619,13 @@
       }
     },
     methods: {
-      onHoverOut(){
+      onHoverOut () {
         this.resetShow = false
       },
-      onHover(){
+      onHover () {
         this.resetShow = true
       },
-      resetParam(){
+      resetParam () {
         this.model.f_preamount = 0
         this.model.f_pregas = 0
         this.model.f_collection = 0
@@ -609,7 +636,7 @@
         this.preamount()
       },
       checkInvoiceMsg () {
-        if (this.model.f_print[0] === '电子发票') {
+        if (['电子发票', '数电普票', '数电专票'].includes(this.model.f_print[0])) {
           if (!this.row.f_taxpayer_id) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }
@@ -619,6 +646,9 @@
           if (!this.row.f_address_phone) {
             this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
           }
+          if (!this.row.f_buy_phone) {
+            this.row.f_buy_phone = this.row.f_user_phone
+          }
           this.confirm()
         } else {
           this.confirm()
@@ -629,7 +659,7 @@
         this.$dispatch('success')
       },
       confirm () {
-        this.eticket_msg=false
+        this.eticket_msg = false
         if (this.model.f_payment.length > 0 && this.model.f_payment.includes('余额写卡')) {
           if (this.model.f_collection > this.row.f_balance) {
             this.$showAlert('请注意！您的账户余额小于当前写卡金额,无法进行余额写卡,请修改后重试', 'warning', 2000)
@@ -700,8 +730,8 @@
         this.model.f_userinfo_id = this.row.f_userinfo_id
         try {
           preamountGen(this)
-          if (this.model.f_preamount>0&&this.model.f_preamount){
-              this.preDisable = true
+          if (this.model.f_preamount > 0 && this.model.f_preamount) {
+            this.preDisable = true
           }
         } catch (error) {
           this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)

package/src/filiale/rongchuang/EticketPrint.vue

@@ -101,6 +101,52 @@ export default {
         this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
       }
     },
+    async openETicketNoModal (sellId, row, type, retry = false) {
+      let model = {
+        id: sellId,
+        f_charge_type: type,
+        f_invoice_type: 0,
+        invoice_kind: row.f_paper_type,
+        org_id: this.$login.f.orgid,
+        retry,
+        isTax: row.invoice_is_pax === '征税' ? 1 : 0,
+        f_paper_name: row.f_paper_name,
+        f_buy_name: row.f_paper_name,
+        f_taxpayer_id: row.f_taxpayer_id,
+        f_address_phone: row.f_address_phone,
+        f_buy_phone: row.f_buy_phone,
+        f_buy_openbank: row.f_paper_account,
+        f_email: row.f_email,
+        remarks: row.f_eticket_reason || null,
+        loginInfo: {
+          operator: this.$login.f.name,
+          operator_id: this.$login.f.id,
+          org_id: this.$login.f.orgid,
+          orgname: this.$login.f.orgs,
+          dep_id: this.$login.f.depids,
+          depname: this.$login.f.deps
+        }
+      }
+      return new Promise(async (resolve, reject) => {
+        try {
+          const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {
+            resolveMsg: null,
+            rejectMsg: '开票请求失败',
+            aoteEncrypt: '无',
+            encryKey: '无'
+          })
+          if (res.data.code === 200 && res.data.data.code === '0000') {
+            resolve('请求成功')
+          } else if (res.data.code === 200 && res.data.data.code === '9999') {
+            reject(res.data.data.msg)
+          } else {
+            reject(new Error('请求失败'))
+          }
+        } catch (error) {
+          reject(new Error(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`))
+        }
+      })
+    },
     async rushRedInvoice (eticket_id) {
       try {
         let model = {

package/src/filiale/rongchuang/IOTMeterCenter.vue

@@ -198,7 +198,7 @@
   </modal>
   <!--文件上传按钮-->
   <eticket-modal :show="eticket_msg" :row="row" @confirm="confirm"></eticket-modal>
-  <eticket-print-async  :show="eticket_show" @toggle="eticket_toggle"  v-ref:asynceticket></eticket-print-async>
+  <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:asynceticket></ticket-print>
 </template>
 <script>
   /**
@@ -253,7 +253,7 @@
     if (self.model.f_payment == '赠气') {
       self.model.f_totalcost = self.model.f_preamount
       self.model.f_collection = 0
-  }
+    }
     self.calText(getGas.data.chargeprice)
   }
   // 输入气量，换算金额
@@ -319,10 +319,10 @@
       await self.$resetpost('rs/logic/updatefiles', data)
       console.log('物联网收费返回。。。', res.data.id)
       // 开始打票
-      console.log('开始打票', self.config,self.model.f_print)
+      console.log('开始打票', self.config, self.model.f_print)
 
       if (self.config.hasPrint) {
-        if (self.model.f_print.indexOf('电子发票') == -1) {
+        if (!['电子发票', '数电普票', '数电专票'].includes(self.model.f_print[0])) {
           console.log('self.config.hasBillManage', self.config.hasBillManage)
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
@@ -336,9 +336,40 @@
           }
         } else if (self.config.printType === '国税发票') {
           // TODO
-        } else if (self.model.f_print[0] === '电子发票') {
-          self.eticket_show=true
-          await self.$refs.asynceticket.openEticket(res.data.id, self.row,'物联网收费')
+        } else if (['电子发票', '数电普票', '数电专票'].includes(self.model.f_print[0])) {
+          // self.eticket_show = true
+          await self.$refs.asynceticket.openETicketNoModal(res.data.id, self.row, '物联网收费').then(
+            (_res) => {
+              if (self.config.hasBillManage) {
+                // 启用发票管理，获取票据管理中的票号并存储记录
+                self.row.id = res.data.id
+                self.row.f_bill_type = '物联网收费'
+                self.row.f_bill_style = self.model.f_print
+                self.print = true
+              } else {
+                self.row.id = res.data.id
+                self.print = true
+              }
+            }
+          ).catch((error) => {
+            if (error.status === 301) {
+              self.$dispatch('refresh')
+            } else {
+              if (error) {
+                self.$showAlert('收费成功,电子票开具失败，' + error + '，请在自定义开票页面补开发票。', 'danger', 0)
+              }
+            }
+            if (self.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              self.row.id = res.data.id
+              self.row.f_bill_type = '物联网收费'
+              self.row.f_bill_style = self.model.f_print
+              self.print = true
+            } else {
+              self.row.id = res.data.id
+              self.print = true
+            }
+          })
         }
       } else {
         self.$dispatch('success')
@@ -360,11 +391,10 @@
     console.log('卡表收费config', self.config)
     // 默认打印格式
     // 默认打印格式
-    if(self.row.f_paper_type){
-      self.model.f_print=self.row.f_paper_type instanceof Array  ? self.row.f_paper_type : [self.row.f_paper_type ]
-
-    }else{
-      self.model.f_print = self.config.printType instanceof Array  ? self.config.printType : [self.config.printType]
+    if (self.row.f_paper_type) {
+      self.model.f_print = self.row.f_paper_type instanceof Array ? self.row.f_paper_type : [self.row.f_paper_type ]
+    } else {
+      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     }
     // self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
@@ -406,8 +436,8 @@
     title: '卡表收费',
     data () {
       return {
-        //发票相关
-        eticket_msg:false,
+        // 发票相关
+        eticket_msg: false,
         eticket_show: false,
         resid: [],  // 存放新增的f_files表中id
         config: {
@@ -544,7 +574,8 @@
     },
     methods: {
       checkInvoiceMsg () {
-        if (this.model.f_print[0] === '电子发票') {
+        console.debug('checkInvoiceMsg', this.model.f_print[0])
+        if (['电子发票', '数电普票', '数电专票'].includes(this.model.f_print[0])) {
           if (!this.row.f_taxpayer_id) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }
@@ -554,6 +585,9 @@
           if (!this.row.f_address_phone) {
             this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
           }
+          if (!this.row.f_buy_phone) {
+            this.row.f_buy_phone = this.row.f_user_phone
+          }
           this.confirm()
         } else {
           this.confirm()
@@ -567,7 +601,7 @@
         this.showfiles = !this.showfiles
       },
       confirm () {
-        this.eticket_msg=false
+        this.eticket_msg = false
         this.clickConfirm = true
         this.model.f_curbalance = this.curbalance
         this.$dispatch('no-button')