sale-client 3.6.278 → 3.6.279

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -302,6 +302,7 @@
                 </div>
               </div>
             </criteria>
+
             <data-grid :model="model" class="list_area table_sy" @dblclick="$parent.modifyUser" v-ref:grid partial='list'>
               <template partial='head'>
                 <tr>
@@ -344,6 +345,12 @@
                   <th>
                     <nobr>气表品牌</nobr>
                   </th>
+               <th>
+                    <nobr>阀控状态</nobr>
+                  </th>
+                  <th>
+                    <nobr>阀门状态</nobr>
+                  </th>
                   <th>
                     <nobr>发卡状态</nobr>
                   </th>
@@ -385,6 +392,8 @@
                 <td style="text-align: center;">{{row.f_gasproperties}}</td>
                 <td style="text-align: center;">{{row.f_meter_classify}}</td>
                 <td style="text-align: center;">{{row.f_meter_brand}}</td>
+                <td style="text-align: center;">{{row.f_network_valve}}</td>
+                <td style="text-align: center;">{{row.f_valvestate}}</td>
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>

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

@@ -207,7 +207,7 @@ export default {
   title: '发票管理',
   data () {
     return {
-      model: new PagedList('rs/sql/open_eticket_JBquery', 20,
+      model: new PagedList('rs/sql/open_eticket_JBquery', 1000,
         {}),
       criteriaShow: false,
       getfield: {},
@@ -305,9 +305,6 @@ export default {
       if (!this.row.f_address_phone) {
         this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
       }
-      if(!this.row.f_email){
-        this.row.f_email = this.row.f_email
-      }
       this.eticket_msg = true
     },
     confirm () {
@@ -328,6 +325,8 @@ export default {
     },
     addOrRemove (is) {
       this.selecteds = []
+      this.summary.gas = 0
+      this.summary.money = 0
       if (!is) { // 添加本页所有数据到ids中
         this.model.rows.forEach((row) => {
           this.selecteds.push(row)
@@ -341,6 +340,11 @@ export default {
         })
         this.selectAll = false
       }
+      this.summary.count = this.selecteds.length
+      this.selecteds.forEach(item => {
+        this.summary.gas += item.f_oughtamount
+        this.summary.money += item.f_oughtfee
+      })
     },
     checkbox (val, event) {
       // this.selecteds = []