sale-client 3.6.43 → 3.6.44

package/package.json

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

package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue

@@ -108,7 +108,7 @@
   </div>
   <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
     <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeEticket"><span>&times;</span></button>
+      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
       <h4 class="modal-title">发票信息</h4>
     </header>
     <article slot="modal-body" class="modal-body">
@@ -126,7 +126,6 @@
                       :value.sync="invoice_is_pax"
                       close-on-select
                       :width="60"
-                      :disabled="disabled"
                       :value-single="true"
                       :search="false"
                       :options='is_pax' clear-button>
@@ -137,7 +136,7 @@
             <input class="form-control col-sm-2"
                    v-model="row.f_paper_account" placeholder="购方开户行及账号">
           </div>
-          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_taxpayer_id ? 'has-error' : '']">
+          <div class="col-sm-12 form-group form-input-group" >
             <label class="control-label">纳税人识别号:</label>
             <input class="form-control col-sm-2"
                    v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
@@ -147,12 +146,17 @@
             <input class="form-control col-sm-2"
                    v-model="row.f_address_phone" placeholder="开票地址">
           </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label">邮箱推送:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_email" placeholder="邮箱推送">
+          </div>
         </div>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
       <button type="button" class="btn button_search"
-              :disabled="!(row.f_taxpayer_id&&row.f_paper_name&&row.f_address_phone)"
+              :disabled="!(row.f_paper_name&&row.f_address_phone)"
               @click='confirm'>确认收费
       </button>
     </footer>
@@ -204,6 +208,7 @@
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         this.row = _row.data[0]
         this.row.id = row.id
+        this.row.f_type = row.f_type
         this.invoice_show_gas = this.row.f_collection_type == '按气量' ? '是' : '否'
         if (!this.row.f_taxpayer_id) {
           this.row.f_taxpayer_id = this.row.f_idnumber
@@ -264,10 +269,7 @@
         this.eticket_msg = false
         this.disabled = false
         this.eticket_show = true
-        if (this.selecteds.map(item => item.f_type).toString() == '其他收费' || this.selecteds.map(item => item.f_type).toString() == '卡表收费' || this.selecteds.map(item => item.f_type).toString() == '发卡售气') {
-          this.invoice_show_gas = '是'
-        }
-        this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, this.selecteds.map(item => item.f_type).toString())
+        this.$refs.eticketbill.openETicket(this.row.id, this.row, this.row.f_type)
       },
       eticket_toggle () {
         this.eticket_show = false

package/src/components/revenue/comprehen/Bill/EticketV4/EticketManage.vue

@@ -9,7 +9,7 @@
     <tabs header="卡表结算">
       <e-ticket-open-card-query-v4></e-ticket-open-card-query-v4>
     </tabs>
-    <tabs header="抄表结算">
+    <tabs header="机表抄表结算">
       <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>
     </tabs>
     <tabs header="自定义开票">

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenJBPage.vue

@@ -32,7 +32,7 @@
                 <label class="font_normal_body">&nbsp;开始时间</label>
                 <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
                             class="datepicker"
-                            condition="f_hand_date >= '{} 00:00:00'"
+                            condition="f_input_date >= '{} 00:00:00'"
                             placeholder="起始时间"
                             style="width:60%"
                             v-model="model.f_start_date"
@@ -42,7 +42,7 @@
                 <label class="font_normal_body">结束时间</label>
                 <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
                             class="datepicker"
-                            condition="f_hand_date <= '{} 23:59:59'"
+                            condition="f_input_date <= '{} 23:59:59'"
                             placeholder="结束时间"
                             style="width:60%"
                             v-model="model.f_end_date"
@@ -162,7 +162,7 @@
 import {HttpResetClass, PagedList} from 'vue-client'
 import * as Util from '../../../../../Util'
 let asyncReadyGen = async function (self) {
-  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
+  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString()
   self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
   await self.search()
 }

package/src/filiale/shexian/sale.js

@@ -17,7 +17,7 @@ export default function () {
 
   // 机表抄表
   Vue.component('high-meter', (resolve) => { require(['./HighMeterCard'], resolve) })
-  Vue.component('upload-idcard', (resolve) => {require(['./UploadIdCard'], resolve) })
+  Vue.component('upload-idcard', (resolve) => { require(['./UploadIdCard'], resolve) })
   // 换表
   Vue.component('change-meter', (resolve) => { require(['./revenue/newchangemeter/ChangeMeter'], resolve) })
   // 清零