sale-client 3.6.540 → 3.6.541

package/package.json

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

package/src/filiale/gehua/handAccount/handList.vue

@@ -48,6 +48,25 @@
                           condition="f_user_type = '{}'"
                           close-on-select></v-select>
               </div>
+              <div class="form-group"
+                   :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-4':$parent.$parent.$parent.isdetail}">
+                <label class="font_normal_body">用气性质</label>
+                <v-select :value.sync="model.f_user_type" v-model="model.f_gasproperties"
+                          :options='$parent.$parent.gasproperties' placeholder='用气性质'
+                          condition="f_gasproperties = '{}'"
+                          close-on-select></v-select>
+              </div>
+              <div class="form-group"
+                   :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-4':$parent.$parent.$parent.isdetail}">
+                <label class="font_normal_body">气表类型</label>
+                <v-select :value.sync="model.f_meter_classify" v-model="model.f_meter_classify"
+                          :options='$parent.$parent.meterType' placeholder='气表类型'
+                          condition="f_meter_classify = '{}'"
+                          :value-single="true"
+                          @change="$parent.$parent.getType(model.f_meter_classify)"
+                          close-on-select></v-select>
+              </div>
+
               <div class="form-group"
                    :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-4':$parent.$parent.$parent.isdetail}">
                 <label class="font_normal_body">气表品牌</label>
@@ -222,6 +241,8 @@ export default {
       printstyle: this.$appdata.getParam('打印格式'),
       // 要操作的用户
       rowsdata: [],
+      meterbrandBak: [],
+      gasBrand: [],
       // 控制全选
       all: [],
       // 结算进度进度
@@ -235,7 +256,8 @@ export default {
     this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString()
     await this.$LoadParams.loadParam()
     let arr = []
-    this.$GetSaleParam.getGasbrand().forEach((item) => {
+    this.gasBrand = this.$GetSaleParam.getGasbrand()
+    this.gasBrand.forEach((item) => {
       let temp = {}
       if (item.value.f_meter_type === '物联网表' || item.value.f_meter_type === '机表') {
         temp.label = item.label
@@ -243,6 +265,7 @@ export default {
         arr.push(temp)
       }
     })
+    this.meterbrandBak = [{label: '全部', value: ''}, ...arr]
     this.meterbrand = [{label: '全部', value: ''}, ...arr]
     this.getfield = this.config.excelHeaders
   },
@@ -255,6 +278,23 @@ export default {
     batchSettlementBefore () {
       this.showPrint = true
     },
+    getType (row) {
+      console.log(row)
+      let arr = []
+      if (row) {
+        this.gasBrand.forEach((item) => {
+          let temp = {}
+          if (item.value.f_meter_type === row) {
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            arr.push(temp)
+          }
+          this.meterbrand = [{label: '全部', value: ''}, ...arr]
+        })
+      } else {
+        this.meterbrand = this.meterbrandBak
+      }
+    },
     async batchSettlement () {
       this.mergeRowData()
       if (!this.f_bill_style) {
@@ -445,8 +485,11 @@ export default {
     userType () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
     },
-    metertype () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+    gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    },
+    meterType () {
+      return [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}]
     }
   }
 }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/fugu/sale'
+import FilialeSale from './filiale/gehua/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'