manage-client 3.1.43 → 3.1.47

package/src/filiale/jingwei/RecordInfoQuery.vue

@@ -166,8 +166,8 @@
                     <label class="font_normal_body">气价名称</label>
                     <v-select :value.sync="model.f_price_name" v-model="model.f_price_name"
                               :options="$parent.$parent.pricenames" placeholder='气价名称'
-                              condition="f_price_name = '{}'"
-                              :is-mul="mul"
+                              condition="f_price_name in {}"
+                              multiple
                               close-on-select ></v-select>
                   </div>
                   <div class="col-sm-2 form-group" >
@@ -294,7 +294,17 @@
                               close-on-select
                               v-el:cc></v-select>
                   </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">设备类型</label>
+                    <v-select :value.sync="model.f_devices_type"
+                              style="width:60%"
+                              v-model="model.f_devices_type"
+                              :options='$parent.$parent.deviceTypes' placeholder='设备类型'
+                              condition="f_devices_type = '{}'"
+                              close-on-select></v-select>
+                  </div>
                 </div>
+
               </div>
             </criteria>
 
@@ -678,6 +688,7 @@
         bookSlice:[{label: '全部',value: ''}],
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
       }
     },
     ready(){