manage-client 3.3.232-kl → 3.3.233

package/src/components/sale/filesquery/UserQuery.vue

@@ -66,9 +66,17 @@
                     <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
                               v-model="model.f_user_type" condition="f_user_type = '{}'"
+                              @change="$parent.$parent.userTypeChange()"
                               :options='$parent.$parent.userTypes' placeholder='请选择'
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">用气性质</label>
+                    <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                              :options='$parent.$parent.gasproperties' placeholder='请选择'
+                              condition="f_gasproperties = '{}'"
+                              close-on-select></v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;&nbsp;</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
@@ -335,6 +343,9 @@
                   <th>
                     <nobr>客户类型</nobr>
                   </th>
+                  <th>
+                    <nobr>用气性质</nobr>
+                  </th>
                   <th>
                     <data-order field="f_address" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -434,6 +445,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_user_type}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_gasproperties}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
@@ -589,6 +603,7 @@
         printshow: false,
         all: false,
         fields: {},
+        gasproperties: [],
         //排序
         orderitem:'f_userinfo_code desc',
         orderFields: {
@@ -718,6 +733,16 @@
       cancel(obj) {
         this.show = false
       },
+      userTypeChange() {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+
       showmsg(obj){
 
         this.rowdata=obj