sale-client 3.6.220 → 3.6.221

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://120.46.92.69:8700/', 'http://120.46.92.69:8700/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenCard.vue

@@ -122,7 +122,7 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
+            <label class="control-label">发票种类:</label>
             <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenPage.vue

@@ -122,8 +122,7 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
-            <v-select v-model="invoice_type"
+            <label class="control-label">发票种类:</label>            <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"
                       close-on-select

package/src/filiale/tongchuan/EticketOpenJBPage.vue

@@ -133,8 +133,7 @@
                    v-model="row.f_paper_name" placeholder="开票名称">
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
-            <v-select v-model="invoice_type"
+            <label class="control-label">发票种类:</label>            <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"
                       close-on-select

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

@@ -158,7 +158,7 @@
                    v-model="row.f_paper_name" placeholder="开票名称">
           </div>
           <div class="col-sm-6 form-group form-input-group">
-            <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+            <nobr><label class="control-label">是否征税:</label></nobr>
             <v-select v-model="invoice_is_pax"
                       placeholder='请选择'
                       :value.sync="invoice_is_pax"
@@ -171,7 +171,7 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
+            <label class="control-label">发票种类:</label>
             <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"
@@ -220,7 +220,7 @@
     <footer slot="modal-footer" class="modal-footer">
       <button type="button" class="btn button_search"
               v-if="!diytick"
-              :disabled="!(row.f_paper_name&&row.f_address_phone)"
+              :disabled="!(row.f_paper_name&&row.f_buy_address&&row.f_buy_phone)"
               @click='confirm'>确认收费
       </button>
       <button type="button" class="btn button_search"
@@ -330,7 +330,10 @@
               f_address_phone: res.data[0].f_address_phone,
               f_user_id: res.data[0].f_user_id,
               f_userinfo_id: res.data[0].f_userinfo_id,
-              f_userfiles_id: res.data[0].f_userfiles_id}
+              f_userfiles_id: res.data[0].f_userfiles_id,
+              f_buy_phone: res.data[0].f_user_phone,
+              f_buy_address: res.data[0].f_address
+            }
             )
           }
         )

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

@@ -145,16 +145,25 @@ export default {
           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_buy_address: custModel.f_buy_address,
+          f_buy_phone: custModel.f_buy_phone,
           f_mail_push: custModel.f_email,
           f_buy_openbank: custModel.f_paper_account,
+          f_userinfo_id: custModel.f_userinfo_id,
           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 === '征税'
+          is_pax: invoice_is_pax === '征税',
+          isTax: invoice_is_pax === '征税' ? 1 : 0,
+          invoice_type: 0,
+          retry: true
         }, custModel)
         // TODO 组织开票数据并保存
-        let ticket_id = await this.$resetpost('rs/logic/TCcombineCustData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
-        return this.openEticketGen(ticket_id.data)
+        const res = await this.$resetpost('/invoice/rs/logic/customInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
+        if (res.data.code === 200 && res.data.data.code == '0000') {
+          this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
+        } else {
+          this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'
+        }
       } catch (error) {
         this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
       }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/yuncheng/sale'
+import FilialeSale from './filiale/tongchuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'