apply-clients 5.0.36 → 5.0.37-2

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="d1">
-    <div class="left col-sm-12">
+    <div class="left col-sm-12" style="height:90%;">
       <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
           <form novalidate class="" partial>
             <div class="col-sm-12">
               <div class="col-sm-2 ">
@@ -53,7 +53,15 @@
                   </v-select>
                 </div>
               </div>
-
+              <div class="col-sm-2" >
+                <label class="col-sm-4 control-label">支付账户</label>
+                <div class="col-sm-8">
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'安泰',value:'安泰'},{label:'欣泰',value:'欣泰'}]"
+                            condition="f_payment_account = '{}'" placeholder='支付账户'
+                            v-model="model.f_payment_account" :value.sync="model.f_payment_account" close-on-select>
+                  </v-select>
+                </div>
+              </div>
             </div>
             <div class="col-sm-12" style="margin-top:5px;">
               <div class="col-sm-2">
@@ -110,17 +118,26 @@
                   </v-select>
                 </div>
               </div>
+              <!-- <div class="col-sm-2" style="float: left">
+                <label class="col-sm-4 control-label">报装来源</label>
+                <div class="col-sm-8">
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.alloption"
+                            condition="f_apply_source = '{}'" placeholder='报装来源'
+                            v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
+                  </v-select>
+                </div>
+              </div> -->
               <div class="col-sm-2" style="float: left">
                 <label class="col-sm-4 control-label">报装来源</label>
                 <div class="col-sm-8">
-                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'微信',value:'微信'}]"
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'住建局',value:'住建局'},{label:'燃气系统',value:'燃气系统'},{label:'电话预约',value:'电话预约'},{label:'微信预约',value:'微信预约'}]"
                             condition="f_apply_source = '{}'" placeholder='报装来源'
                             v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
                   </v-select>
                 </div>
               </div>
               <div class="col-sm-1" style="margin-left:20px;">
-                <button style="margin-left:5%;" class="btn btn-primary btn-sm width-80 button_spacing" type="button" @click="search(),$parent.$parent.close()">
+                <button style="margin-left:5%;" class="btn btn-primary btn-sm width-80 button_spacing" type="button" @click="search(),$parent.$parent.cleaner()">
                   <span class="glyphicon glyphicon-search"></span>查询
                 </button>
                 <button class="btn-primary btn btn-sm button_spacing" @click.prevent="$parent.$parent.clear()">清空</button>
@@ -164,6 +181,15 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
+              <th>
+                <nobr>应缴金额</nobr>
+              </th>
+              <th>
+                <nobr>已缴金额</nobr>
+              </th>
+              <th>
+                <nobr>未缴金额</nobr>
+              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -204,6 +230,15 @@
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_total_cost}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_cumulative_money}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_unaccounts_money}}</nobr>
+              </td>
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -212,6 +247,15 @@
         </data-grid>
       </criteria-paged>
     </div>
+    <div  class="flex" style="height: 10%;width: 100%;">
+      <div novalidate class="form-inline auto" partial>
+        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">合计收费记录共
+          <span style="color: red">{{model.rows.length}}</span>笔，
+          合计应缴总金额<span style="color: red">{{price.rows[0].f_total_cost}}</span>元，
+          已缴<span style="color: red">{{price.rows[0].f_cumulative_money}}</span>元，未缴<span  style="color: red">{{price.rows[0].f_unaccounts_money}}</span>元
+        </p>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -246,40 +290,81 @@
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
             id: `${this.$login.f.name}`,
-            fengongsi: `${this.$login.f.f_fengongsi}`
+            fengongsi: `${this.$login.f.f_fengongsi}`,
+            f_product_id :0
+          }
+        }),
+        modeluse: new PagedList('rs/sql/supervisory', 999999, {
+          data: {
+            id: `${this.$login.f.name}`,
+            fengongsi: `${this.$login.f.f_fengongsi}`,
+            f_product_id :0
           }
         }),
+        price: new PagedList('rs/sql/getChargeAllSum', 999999, {orderitem: '`f_total_cost`'}),
         condition: '',
         select: '',
-        alloptions:[]
+        alloptions:[],
+        alloption:[]
       }
     },
     ready() {
       this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-      this.$refs.cp.$refs.cri.search()
+      this.search()
       this.getConfig();
     },
     methods: {
+      selfSearch (args) {
+        args.condition = args.condition + ` and u.f_filiale = '${this.$login.f.f_fengongsi}' `
+        this.model.search(args.condition,args.model)
+      },
+      search () {
+        let startDate = Util.toStandardDateString() + ' 00:00:00'
+        let endDate = Util.toStandardDateString() + ' 23:59:59'
+        this.$refs.cp.$refs.cri.condition = this.$refs.cp.$refs.cri.condition + ` and u.f_filiale = '${this.$login.f.f_fengongsi}' `
+        this.$refs.cp.$refs.cri.search()
+      },
+      cleaner () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = ''
+        })
+      let condition = this.$refs.cp.$refs.cri.condition + ` and u.f_filiale = '${this.$login.f.f_fengongsi}' `
+        // console.log('condition2:', this.$refs.cp.$refs.cri.condition)
+        // this.modeluse.search(condition)
+        this.price.search(condition)
+        this.$dispatch('close')
+      },
       clear(){
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
           this.$refs.cp.$refs.cri.model[key] = []
         })
       },
       getapplyName(datas){
-        console.log("开始获取所有名")
+        debugger
+        // console.log("开始获取所有名"+ data.fields[1].value)
+        console.log('现在取得的值为这个东西'+datas)
         let str = datas
         console.log("开始获取所有名"+JSON.stringify(str))
         let param = [];
+        // let ces = [];
         // let workflow = JSON.parse(str);
+        // 动态获取报装来源
+        // let http = new HttpResetClass()
+        // http.load('POST', 'rs/sql/findParameter').then((res) => {
+        //       console.log("这是报装来源:" + res.name)
+        // res.forEach(function(res){
+        //   ces.push({label:res.name,value:res.name});
+        //     })
+        //     this.alloption = ces;
+        // })
         param.push({label:"全部",value:""})
         str.activitys.forEach(function(item){
           let title = item.title;
-          console.log(title)
+          console.log("这是title的值：" + title)
           param.push({label:title,value:title});
         })
         this.alloptions = param;
-
       },
       async getConfig(){
         let http = new HttpResetClass()
@@ -336,12 +421,12 @@
   }
 </script>
 <style>
-  label {
-    display: flex;
-    justify-content:center;
-    align-items:Center;
-    padding-top: 8px;
-  }
+  /*label {*/
+  /*  display: flex;*/
+  /*  justify-content:center;*/
+  /*  align-items:Center;*/
+  /*  padding-top: 8px;*/
+  /*}*/
   tr.title {
     background-color: #6666ff;
   }

package/src/components/product/applyReport/ApplyReport.vue

@@ -0,0 +1,205 @@
+<template>
+  <div class="d1 flex">
+    <div class="left col-sm-12">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+          <form novalidate class="" partial>
+            <div class="row">
+                <button type="button" class="btn btn-success" @click='$parent.$parent.showQuery=!$parent.$parent.showQuery'>
+                  打印
+                </button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/saleExport" sql-name="checkuserReport" template-name='报装统计导出' :choose-col="true"></export-excel>
+                <button class="btn btn-primary btn-sm" type="button" @click="$parent.$parent.search(),$parent.$parent.showpager()" style="margin-left:10%">
+                  <span class="glyphicon glyphicon-search"></span>查询
+                </button>
+            </div>
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid  class="list_area" is-fixed='false'>
+          <template partial='head'>
+            <tr>
+              <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+            </tr>
+            <tr>
+              <th colspan="1" rowspan="2">报装人员</th>
+              <th colspan="2">个人报建</th>
+              <th colspan="4">集体报建</th>
+            </tr>
+            <tr class="title">
+              <th>
+                <nobr>踏勘</nobr>
+              </th>
+              <th>
+                <nobr>安装</nobr>
+              </th>
+              <th>
+                <nobr>踏勘</nobr>
+              </th>
+              <th>
+                <nobr>安装</nobr>
+              </th>
+              <th>
+                <nobr>验收</nobr>
+              </th>
+              <th>
+                <nobr>通气</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align: center;">
+                <nobr>{{row.username}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gsurvey_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gconstruction_unit}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jsurvey_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jconstruction_unit}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.checking_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jgas_name}}</nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+      <div  class="flex" style="height: 10%">
+        <div novalidate class="form-inline auto" partial>
+          <p class="bg-info text-center" style="padding: 8px;font-size: 20px">个体报建
+             勘踏合计：<span style="color: red">{{total.rows[0].sumgname}}</span>次，安装合计：<span style="color: red">{{total.rows[0].sumgunit}}</span>次，
+             集体报建 勘踏合计：<span style="color: red">{{total.rows[0].sumname}}</span>次，安装合计：<span  style="color: red">{{total.rows[0].sumjunit}}</span>次，
+            验收合计：<span style="color: red">{{total.rows[0].sumgcname}}</span>次，
+            通气合计：<span  style="color: red">{{total.rows[0].sunjname}}</span>次
+          </p>
+        </div>
+      </div>
+    </div>
+    <modal  :show.sync="showQuery" v-ref:modal :large="true" :backdrop="false" title="打印预览">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showQuery = !showQuery"><span>&times;</span></button>
+        <h4 class="modal-title">打印预览</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <print-report-order :purchase-records="purchaseRecords" :report="model.rows" v-ref:print></print-report-order>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" @click="print()">打印</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+  import {
+    PagedList
+  } from 'vue-client'
+  import * as Util from '../../Util'
+
+  export default {
+    title: '报建统计报表',
+    data() {
+      return {
+        usertype: this.$appdata.getParam('用户类型'),
+        showbtn: false,
+        model: new PagedList('rs/sql/checkuserReport', 20, {
+          data: {
+            id: this.$login.f.id,
+            fengongsi: this.$login.f.f_fengongsi,
+          }
+        }),
+        condition: '',
+        showQuery:false,
+        total: new PagedList('rs/sql/checkuserReportTotal', 999999, {orderitem: '`sumname`'}),
+        showstopinfoflag:false,
+        stopremarks:"",
+        getfield: {
+          'username': '报装人员',
+          'gsurvey_name': '个体报建踏勘次数',
+          'gconstruction_unit': '个体报建安装次数',
+          'jsurvey_name': '集体报建踏勘次数',
+          'jconstruction_unit': '集体报建安装次数',
+          'checking_name': '集体报建验收次数',
+          'jgas_name': '集体报建通气次数'
+        }
+      }
+    },
+    ready() {
+      this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+      this.search()
+
+    },
+    methods: {
+      print () {
+        this.$refs.print.$refs.print.PrintTable()
+      },
+      stopinfoshow(index){
+        this.showstopinfoflag = true;
+        let remakrs = this.model.rows[index].f_stop_remarks;
+        console.log(JSON.stringify(remakrs))
+        console.log(remakrs)
+
+        this.stopremarks= remakrs;
+      },
+      clifun(row) {
+        this.$refs.cp.$refs.grid.model.rows = [row]
+        this.$refs.cp.pager = false
+        this.$dispatch('showbtn', row)
+      },
+      search () {
+        let condition = "1=1"
+        //  debugger
+        // let condition =  args.condition
+        debugger
+        this.model.search()
+        this.total.search()
+      },
+      showpager() {
+        this.$refs.cp.pager = true
+        this.$dispatch('hiddenbtn')
+      },
+      closestopinfo(){
+        this.showstopinfoflag = close;
+      }
+    },
+    computed: {
+      getCondition() {
+        return {condition: `1=1`}
+      }
+    }
+  }
+</script>
+<style scoped>
+  label {
+    display: flex;
+    justify-content:center;
+    align-items:Center;
+    padding-top: 8px;
+  }
+</style>

package/src/components/product/applyReport/PrintApplyReport.vue

@@ -0,0 +1,116 @@
+<template>
+  <style id="style">
+    td{
+      height: 30px;
+      padding: 0px;
+      text-align: center;
+    }
+    .cen{
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+  </style>
+  <div id="print">
+    <table border="1">
+      <tr>
+        <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+      </tr>
+      <tr>
+        <th colspan="1" rowspan="2" class="cen">报装人员</th>
+        <th colspan="2" class="cen">个人报建</th>
+        <th colspan="4" class="cen">集体报建</th>
+      </tr>
+      <tr class="title">
+        <th class="cen">
+          <nobr>踏勘</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>安装</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>踏勘</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>安装</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>验收</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>通气</nobr>
+        </th>
+      </tr>
+      <tr v-for="item in report">
+        <td>{{item.username}}</td>
+        <td>{{ item.gsurvey_name }}</td>
+        <td>{{ item.gconstruction_unit }}</td>
+        <td>{{ item.jsurvey_name }}</td>
+        <td>{{ item.jconstruction_unit }}</td>
+        <td>{{ item.checking_name }}</td>
+        <td>{{ item.jgas_name }}</td>
+      </tr>
+      <tr v-for="item in supplement">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <print-element v-show="false" v-ref:print id='print' styleid='style'
+                 top='10' left='60' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+  export default {
+    title: '打印统计单',
+    props: ['report'],
+    data () {
+      return {}
+    },
+    ready () {
+    },
+    methods: {
+    },
+    computed: {
+      supplement () {
+        if (this.material.length < 10) {
+          return 10 - this.material.length
+        }
+        return 0
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/product/stopInfo/ApplyStopInfo.vue

@@ -230,7 +230,8 @@
                 model: new PagedList('rs/sql/checkuserStop', 20, {
                     data: {
                         id: this.$login.f.id,
-                        fengongsi: this.$login.f.f_fengongsi
+                        fengongsi: this.$login.f.f_fengongsi,
+                        f_product_id: 0
                     }
                 }),
                 condition: '',

package/src/ezhouAndroid.js

@@ -0,0 +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) })
+}

package/src/index.js

@@ -1,7 +1,8 @@
 import apply from './apply'
 import applyAndroid from './applyAndroid'
-
+import ezhouAndroid from './ezhouAndroid'
 export {
   apply,
-  applyAndroid
+  applyAndroid,
+  ezhouAndroid
 }

package/src/main.js

@@ -7,7 +7,7 @@ import {sale} from 'sale-client'
 import {material} from 'material-client'
 
 import apply from './apply'
-import applyAndroid from './applyAndroid'
+import applyAndroid from './ezhouAndroid'
 import 'lib-flexible/flexible.js'
 /*import vueBubble from 'vue-bubble'
 Vue.use(vueBubble)*/

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)