apply-clients 5.0.35-ezhou-25-13 → 5.0.35-ezhou-25-16

package/src/ezhouAndroid.js

@@ -1,48 +1,48 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-/** ***************************报建模块*********************************/
-  // 报建 总入口
-  Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
-  // 报建 总入口
-  Vue.component('one-to-many', (resolve) => { require(['./components/app_apply/OneToMany'], resolve) })
-  // 报建 待办流程页
-  Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
-  // 报建 已办事项
-  Vue.component('applydownlist', (resolve) => { require(['./components/app_apply/ApplyDownList'], resolve) })
-  // 报建 上传
-  Vue.component('applylistupload', (resolve) => { require(['./components/app_apply/ApplyListUpload'], resolve) })
-  // 报建 待办事项
-  Vue.component('applytodolist', (resolve) => { require(['./components/app_apply/ApplyToDoList'], resolve) })
-  // 报建 用户信息
-  Vue.component('apply-user-info', (resolve) => { require(['./components/app_apply/ApplyUserInfo'], resolve) })
-  // 报建 报建流程信息
-  Vue.component('apply-info', (resolve) => { require(['./components/app_apply/ApplyInfo'], resolve) })
-  // 报建 现场勘探
-  Vue.component('fieldexploration', (resolve) => { require(['./components/app_apply/FieldExploration'], resolve) })
-  // 报建 竣工验收
-  Vue.component('acceptance', (resolve) => { require(['./components/app_apply/Acceptance'], resolve) })
-  // 报建 通气点火
-  Vue.component('ventilation', (resolve) => { require(['./components/app_apply/Ventilation'], resolve) })
-
-  Vue.component('back-page', (resolve) => { require(['./components/app_apply/ToolsPage.vue'], resolve) })
-
-  // 业务tab(control层)页
-  Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })
-  // 公共业务显示(view层)页
-  Vue.component('service-view-app', (resolve) => { require(['./components/app_apply/ezhou/ServiceView'], resolve) })
-  Vue.component('minyong', (resolve) => { require(['./components/app_apply/ezhou/MinYong'], resolve) })
-  Vue.component('feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongV'], resolve) })
-  Vue.component('feiminyongvv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongVV'], resolve) })
-  // Vue.component('hetong-minyong', (resolve) => { require(['./components/app_apply/ezhou/HeTongMinYong'], resolve) })
-  // Vue.component('hetong-feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/HeTongFeiMinYongV'], resolve) })
-  // 工程 待办事项
-  Vue.component('gongcheng', (resolve) => { require(['./components/app_apply/Gongcheng'], resolve) })
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+/** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
+  // 报建 总入口
+  Vue.component('one-to-many', (resolve) => { require(['./components/app_apply/OneToMany'], resolve) })
+  // 报建 待办流程页
+  Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
+  // 报建 已办事项
+  Vue.component('applydownlist', (resolve) => { require(['./components/app_apply/ApplyDownList'], resolve) })
+  // 报建 上传
+  Vue.component('applylistupload', (resolve) => { require(['./components/app_apply/ApplyListUpload'], resolve) })
+  // 报建 待办事项
+  Vue.component('applytodolist', (resolve) => { require(['./components/app_apply/ApplyToDoList'], resolve) })
+  // 报建 用户信息
+  Vue.component('apply-user-info', (resolve) => { require(['./components/app_apply/ApplyUserInfo'], resolve) })
+  // 报建 报建流程信息
+  Vue.component('apply-info', (resolve) => { require(['./components/app_apply/ApplyInfo'], resolve) })
+  // 报建 现场勘探
+  Vue.component('fieldexploration', (resolve) => { require(['./components/app_apply/FieldExploration'], resolve) })
+  // 报建 竣工验收
+  Vue.component('acceptance', (resolve) => { require(['./components/app_apply/Acceptance'], resolve) })
+  // 报建 通气点火
+  Vue.component('ventilation', (resolve) => { require(['./components/app_apply/Ventilation'], resolve) })
+
+  Vue.component('back-page', (resolve) => { require(['./components/app_apply/ToolsPage.vue'], resolve) })
+
+  // 业务tab(control层)页
+  Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })
+  // 公共业务显示(view层)页
+  Vue.component('service-view-app', (resolve) => { require(['./components/app_apply/ezhou/ServiceView'], resolve) })
+  Vue.component('minyong', (resolve) => { require(['./components/app_apply/ezhou/MinYong'], resolve) })
+  Vue.component('feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongV'], resolve) })
+  Vue.component('feiminyongvv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongVV'], resolve) })
+  // Vue.component('hetong-minyong', (resolve) => { require(['./components/app_apply/ezhou/HeTongMinYong'], resolve) })
+  // Vue.component('hetong-feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/HeTongFeiMinYongV'], resolve) })
+  // 工程 待办事项
+  Vue.component('gongcheng', (resolve) => { require(['./components/app_apply/Gongcheng'], resolve) })
+}

package/src/plugins/commonService.js

@@ -4,20 +4,18 @@ let openEticketGen = async function (param, type, conf) {
   // 组织数据
   let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
   console.log('获取的电子票数据', getEticket)
-  try{
     const openEticketParams = {
       url: '/invoice/rs/logic/getFapiao',
       params: {
+        sell_id: param.id,
         eticket_id: `${getEticket.data.eticket_id}`,
-        USERNAME: ''
+        conf: conf
       }
     }
     const res = await Vue.resetpost('rs/logic/callInvoicing', openEticketParams, {resolveMsg: null, rejectMsg: null})
     this.$showAlert(res.data.RETURNMESSAGE || res.data.msg || '开票失败！', res.data.CODE === '0000' ? 'success' : 'danger', 3000)
     return res
-  }catch (e) {
-    Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)
-  }}
+  }
 
 let correctEticketGen = async function (id, type, conf) {
   let param = {