apply-clients 5.0.35 → 5.0.36-2

package/src/plugins/commonService.js

@@ -1,12 +1,15 @@
 import Vue from 'vue'
 
-let openEticketGen = async function (id, type, conf) {
+let openEticketGen = async function (param, type, conf) {
   // 组织数据
-  let getEticket = await Vue.resetpost('rs/logic/combineData', {id: id, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
+  let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
   console.log('获取的电子票数据', getEticket)
-  // 请求电子票
-  await Vue.resetpost('rs/logic/openEticket', {id: getEticket.data, eticket: conf}, {resolveMsg: '开票成功', rejectMsg: '开具电子票出错, 请到票据管理重新开具'})
-}
+  try{
+    let url= await Vue.resetpost('rs/logic/bjopenEticket', {sell_id: param.id,eticket_id:getEticket.data.eticket_id,conf:conf},{resolveMsg: null, rejectMsg: null})
+    return url
+  }catch (e) {
+    Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)
+  }}
 
 let correctEticketGen = async function (id, type, conf) {
   let param = {
@@ -110,13 +113,14 @@ let commonService = {
     await Vue.resetpost('rs/logic/sale_reissueBill', {data: param}, {resolveMsg: null, rejectMsg: '更新发票号失败，请从右侧操作卡片进行补打！！'})
   },
 
-  async openEticket (sellId, chargeType) {
+  async openEticket (param, chargeType) {
     // 获取各分公司下的电子票配置文件
     // 从vues目录下获取电子票配置
     try {
       let conf = await commonService.getSelfConfig()
       console.log('看看配置文件', conf)
-      await openEticketGen(sellId, chargeType, conf)
+      let tecket =await openEticketGen(param, chargeType, conf)
+      return tecket
     } catch (error) {
       console.log('电子发票开票失败', JSON.stringify(error))
       Vue.showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)