sale-client 3.6.527 → 3.6.528

package/package.json

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

package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue

@@ -50,7 +50,7 @@
             <input type="text" v-show="false" v-model="$refs.model.selectedItems"
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
-                      close-on-select
+                      close-on-select :menu-width='menuWidth'  :min-width='menuWidth'
                       v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
@@ -113,7 +113,7 @@
         <div class="row">
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
             <label for="pricename" class="font_normal_body">气价名称</label>
-            <v-select :value.sync="row.pricename" v-model="row.pricename" search
+            <v-select :value.sync="row.pricename" v-model="row.pricename" search :menu-width='menuWidth'  :min-width='menuWidth'
                       placeholder='气价名称' :options="getPricenames" @change="priceChange"
                       close-on-select :disabled="permissionPrice" v-ref:name></v-select>
             <input type="text" v-show="false" v-model="$refs.name.selectedItems" v-validate:name='{required: true }'>

package/src/filiale/qianneng/eticket/EticketOpenCard.vue

@@ -96,9 +96,9 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
+  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900" @close="resetRowData">
     <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
+      <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
       <h4 class="modal-title">发票信息</h4>
     </header>
     <article slot="modal-body" class="modal-body">
@@ -226,6 +226,16 @@ export default {
     asyncReadyGen(this)
   },
   methods: {
+    resetRowData () {
+      this.row = {}
+      this.invoice_type = '数电普票'
+      this.invoice_is_pax = '征税'
+      this.invoice_show_gas = '否'
+    },
+    closeModal () {
+      this.eticket_msg = false
+      this.resetRowData()
+    },
     getorg (val) {
       this.f_orgid = this.$login.convertToIn(val)
     },

package/src/filiale/qianneng/eticket/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="s.f_operate_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="s.f_operate_date <= '{} 23:59:59'"
                             placeholder="结束时间"
                             style="width:60%"
                             v-model="model.f_end_date"
@@ -96,9 +96,9 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
+  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900" @close="resetRowData">
     <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
+      <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
       <h4 class="modal-title">发票信息</h4>
     </header>
     <article slot="modal-body" class="modal-body">
@@ -194,7 +194,7 @@ export default {
         dep: [],
         user: []
       },
-      config:{
+      config: {
         taxforidnumber: true
       },
       eticket_show: false,
@@ -236,7 +236,7 @@ export default {
         //
         //     }
         //   })
-        return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
+        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
       }
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -259,6 +259,12 @@ export default {
       this.invoice_type = this.row.f_paper_type === '数电专票' ? this.row.f_paper_type : '数电普票'
       this.eticket_msg = true
     },
+    resetRowData () {
+      this.row = {}
+      this.invoice_type = '数电普票'
+      this.invoice_is_pax = '征税'
+      this.invoice_show_gas = '否'
+    },
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
@@ -308,6 +314,10 @@ export default {
         // }
       }
       this.selectAll = (this.selecteds.length === this.model.rows.length)
+    },
+    closeModal () {
+      this.eticket_msg = false
+      this.resetRowData()
     }
   },
   computed: {

package/src/filiale/qianneng/eticket/EticketOpenPage.vue

@@ -96,9 +96,9 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
+  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900" @close="resetRowData">
     <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
+      <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
       <h4 class="modal-title">发票信息</h4>
     </header>
     <article slot="modal-body" class="modal-body">
@@ -225,6 +225,16 @@ export default {
     asyncReadyGen(this)
   },
   methods: {
+    resetRowData () {
+      this.row = {}
+      this.invoice_type = '数电普票'
+      this.invoice_is_pax = '征税'
+      this.invoice_show_gas = '否'
+    },
+    closeModal () {
+      this.eticket_msg = false
+      this.resetRowData()
+    },
     getorg (val) {
       this.f_orgid = this.$login.convertToIn(val)
     },