manage-client 3.2.99 → 3.2.102

package/src/filiale/qianneng/sale.js

@@ -3,7 +3,9 @@ let specialComp = {
   'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
   'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
   'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) }
+  'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
+  // 表具查询
+  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/rongchuang/SellingTable.vue

@@ -31,6 +31,7 @@
             <label class="font_normal_body">付款方式:</label>
             <v-select :value.sync="model.f_payment"
                       v-model="model.f_payment"
+                      multiple
                       :options='$parent.$parent.f_payment' placeholder='请选择'
                       condition="f_payment in {}"
                       close-on-select></v-select>

package/src/filiale/shaoguan/RecordInfoQuery.vue

@@ -100,6 +100,11 @@
                               condition="f_meter_brand = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                           condition="f_card_id = '{}'" placeholder='卡号'>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
@@ -318,6 +323,38 @@
                                 condition="f_gas_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">气表表号</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                            condition="f_meternumber like '%{}%'" placeholder='气表表号'>
+                  </div>
+                  <!--<div class="col-sm-2 form-group">-->
+                    <!--<label class="font_normal_body">使用类型</label>-->
+                    <!--<v-select :value.sync="model.f_usetype" v-model="model.f_usetype"-->
+                              <!--:options='$parent.$parent.useTypes' placeholder='请选择'-->
+                              <!--style="width:60%"-->
+                              <!--close-on-select-->
+                              <!--condition="f_usetype = '{}'"></v-select>-->
+                  <!--</div>-->
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表具状态</label>
+                    <v-select :value.sync="model.f_table_state" v-model="model.f_table_state"
+                              :options='$parent.$parent.TableStates' placeholder='请选择'
+                              style="width:60%"
+                              close-on-select
+                              condition="f_table_state = '{}'"></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">安&ensp;装&ensp;人</label>
+                    <v-select :value.sync="model.f_install_person" v-model='model.f_install_person'
+                              style="width:60%"
+                              :multiple="true"
+                              :options='$parent.$parent.person' placeholder='安装人'
+                              condition="f_install_person = '{}'"
+                              close-on-select
+                              v-el:cc></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -784,8 +821,6 @@
           //查询多个抄表员时条件
           args.condition += ` and f_inputtor in  ( ${str} )`
         }
-        //
-        debugger
         this.bookinputtorperson = this.$refs.paged.$refs.cri.model.f_book_inputtor;
         if(this.bookinputtorperson.length !== 0){
           let str = JSON.stringify(this.bookinputtorperson)
@@ -983,7 +1018,12 @@
       },
     },
     computed:{
-
+      bandstates () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('微信绑定')]
+      },
+      TableStates () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      },
       bgl(){
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('壁挂炉')]
       },
@@ -1018,12 +1058,14 @@
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
+      person() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装人')]
+      },
       tablestate() {
         return [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}]
       },
 
        getPricenames() {
-        debugger
          let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
          let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
          let pricetype = this.$refs.paged.$refs.cri.model.pricetype;