sale-client 3.6.264-test → 3.6.266-test

package/package.json

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

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

@@ -131,15 +131,16 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
-          <div class="col-sm-6 form-group form-input-group">
-            <label for="f_print" class="font_normal_body">打印格式</label>
-            <v-select id="print"
-                      v-model="f_print"
+          <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
+            <label class="control-label">发票种类:</label>
+            <v-select v-model="invoice_type"
                       placeholder='请选择'
-                      :multiple="false"
-                      :value.sync="row.f_print"
-                      :options='printstyle'
-                      close-on-select clear-button v-ref:printstyle>
+                      :value.sync="invoice_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
             </v-select>
           </div>
           <div class="col-sm-12 form-group form-input-group">
@@ -158,14 +159,14 @@
                    v-model="row.f_address_phone" placeholder="开票地址">
           </div>
           <div class="col-sm-12 form-group form-input-group">
-            <label class="control-label">邮箱推送:</label>
+            <label class="control-label">手机推送:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_email" placeholder="邮箱推送">
+                   v-model="row.f_buy_phone" placeholder="手机号码">
           </div>
           <div class="col-sm-12 form-group form-input-group">
-            <label class="control-label">备注:</label>
+            <label class="control-label">邮箱推送:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_remarks" placeholder="备注">
+                   v-model="row.f_email" placeholder="邮箱推送">
           </div>
         </div>
       </div>
@@ -200,6 +201,8 @@
         invoice_is_pax: '征税',
         is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
         selecteds: [],
+        invoice_types: this.$appdata.getParam('发票种类'),
+        invoice_type: '',
         eticket_show: false,
         eticket_msg: false,
         invoice_show_gas: '否',
@@ -287,7 +290,7 @@
         this.eticket_msg = false
         this.disabled = false
         this.eticket_show = true
-        this.$refs.eticketbill.openETicket([this.row.id], this.row, '是', this.invoice_is_pax, '结算收费')
+        this.$refs.eticketbill.openETicket([this.row], this.row, this.row.f_type, this.invoice_is_pax, this.invoice_type)
       },
       eticket_toggle () {
         this.eticket_show = false