manage-client 3.3.62 → 3.3.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.62",
+  "version": "3.3.64",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -213,6 +213,11 @@
                               condition="f_networkvalve='{}'">
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">通&nbsp;气&nbsp;人&nbsp;</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_gas_person"
+                           condition="f_gas_person like '%{}%' " placeholder="通气人">
+                  </div>
                 </div>
               </div>
             </criteria>

package/src/components/webmeter/DrillData/GetNoMetereadData.vue

@@ -16,7 +16,7 @@
                 <label class="font_normal_body">客户名称</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_user_name" placeholder='客户名称'
-                       condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                       condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">

package/src/components/webmeter/DrillData/LostContactAnalysis.vue

@@ -32,7 +32,7 @@
             <div class="col-sm-2">
               <label class="font_normal_body">客户名称</label>
               <input @keyup.enter="search"   style="width:60%" type="text" class="input_search" v-model="model.f_user_name" placeholder='客户名称'
-                      condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                      condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
               >
             </div>
 

package/src/components/webmeter/DrillData/LostContactAnalysisList.vue

@@ -22,7 +22,7 @@
                 <label class="font_normal_body">客户名称</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_user_name" placeholder='客户名称'
-                       condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                       condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -15,7 +15,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
-                    <input  style="width:60%" class="input_search" condition="f_user_name = '{}'" placeholder='客户名称' type="text"
+                    <input  style="width:60%" class="input_search" condition="f_user_name like '%{}%'" placeholder='客户名称' type="text"
                            v-el:username v-model="model.f_username" v-next-el='userid'>
                   </div>
                   <div class="col-sm-2 form-group">

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -22,7 +22,7 @@
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                          v-model="model.f_user_name" placeholder='客户名称'
-                         condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                         condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                   >
                 </div>
                 <div class="col-sm-2 form-group">

package/src/components/webmeter/dataCollection/DataCollection.vue

@@ -23,7 +23,7 @@
                   </div>
                   <div class="col-sm-2">
                     <label class="font_normal_body">客户名称</label>
-                    <input class="form-control" condition="f_user_name = '{}'" placeholder='客户名称'
+                    <input class="form-control" condition="f_user_name like '%{}%'" placeholder='客户名称'
                            type="text"
                            v-model="model.f_user_name">
                   </div>

package/src/components/webmeter/gasAnalysis/NewWebmeterSettlementAnalysis.vue

@@ -16,7 +16,7 @@
                 <label class="font_normal_body">客户名称</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_user_name" placeholder='客户名称'
-                       condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                       condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">

package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue

@@ -16,7 +16,7 @@
                 <label class="font_normal_body">客户名称</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_user_name" placeholder='客户名称'
-                       condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                       condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">

package/src/components/webmeter/gasStatistics/GasStatistics.vue

@@ -24,7 +24,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ss.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>

package/src/components/webmeter/gasStatistics/NewGasStatistics.vue

@@ -24,7 +24,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ss.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>

package/src/components/webmeter/handplan/NewWebMeterHandPlan.vue

@@ -22,7 +22,7 @@
           </div>
           <div class="col-sm-2 form-group">
             <label class="font_normal_body">客户名称</label>
-            <input style="width:60%" class="input_search" condition="mr.f_user_name = '{}'" placeholder='客户名称'
+            <input style="width:60%" class="input_search" condition="mr.f_user_name like '%{}%'" placeholder='客户名称'
                    type="text"
                    v-model="model.f_user_name">
           </div>

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -21,7 +21,7 @@
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">客户名称</label>
                 <input
-                       class="input_search" condition="f_user_name = '{}'"
+                       class="input_search" condition="f_user_name like '%{}%'"
                        placeholder='客户名称'
                        style="width:60%"
                        type="text"

package/src/components/webmeter/newwebmeter/ArrearageQuery.vue

@@ -30,7 +30,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="s.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="s.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
 
                 <div class="span" style="float:right;margin-top:10px">

package/src/components/webmeter/newwebmeter/NewException/NewMeterException.vue

@@ -19,7 +19,7 @@
               <div class="col-sm-2 form-group">
                 <label class="control-label">客户名称</label>
                 <input type="text" class="form-control" v-model="model.f_user_name" placeholder='客户名称'
-                       condition="f_user_name = '{}'" v-el:xq v-next-el='username' v-el:username
+                       condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
                 >
               </div>
               <div class="col-sm-2 form-group">

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -21,7 +21,7 @@
                        v-model="model.f_user_name"
                        @keyup.enter="search"
                        placeholder='客户名称'
-                       condition="f_user_name = '{}'"
+                       condition="f_user_name like '%{}%'"
                        v-el:xq v-next-el='username'
                        v-el:username>
               </div>

package/src/components/webmeter/newwebmeter/PriceInstructDetail.vue

@@ -17,7 +17,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
-                    <input style="width:60%" class="input_search" condition="info.f_user_name = '{}'"
+                    <input style="width:60%" class="input_search" condition="info.f_user_name like '%{}%'"
                            placeholder='客户名称' type="text"
                            v-el:username v-model="model.f_username" v-next-el='userid'>
                   </div>

package/src/components/webmeter/newwebmeter/PriceInstructList.vue

@@ -17,7 +17,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
-                    <input style="width:60%" class="input_search" condition="info.f_user_name = '{}'"
+                    <input style="width:60%" class="input_search" condition="info.f_user_name like '%{}%'"
                            placeholder='客户名称' type="text"
                            v-el:username v-model="model.f_username" v-next-el='userid'>
                   </div>

package/src/components/webmeter/newwebmeter/UserGasList.vue

@@ -17,7 +17,7 @@
                 <label class="font_normal_body">客户名称</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_username" placeholder='客户名称'
-                       condition="u.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                       condition="u.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
               </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">客户地址</label>

package/src/components/webmeter/newwebmeter/UserInstructList.vue

@@ -16,7 +16,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户名称</label>
-                    <input   style="width:60%" class="input_search" condition="u.f_user_name = '{}'" placeholder='客户名称' type="text"
+                    <input   style="width:60%" class="input_search" condition="u.f_user_name like '%{}%'" placeholder='客户名称' type="text"
                            v-el:username v-model="model.f_username" v-next-el='userid'>
                   </div>
                   <div class="col-sm-2 form-group">

package/src/components/webmeter/newwebmeter/signAnalysisListMain.vue

@@ -27,7 +27,7 @@
               <div class="col-sm-2">
                 <label class="font_normal_body">客户名称</label>
                 <input @keyup.enter="search"  style="width:60%" type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                       condition="u.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                       condition="u.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
               </div>
               <div class="span" style="float:right;">
 

package/src/components/webmeter/recharge/RechargeList.vue

@@ -38,7 +38,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="s.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="s.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
 
                 <div class="span" style="float:right;margin-top:10px">

package/src/components/webmeter/report/ReportList.vue

@@ -38,7 +38,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ui.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="ui.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
 
                 <div class="span" style="float:right;margin-top:10px">

package/src/components/webmeter/reportdata/ReportDataQuery.vue

@@ -14,7 +14,7 @@
                 <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_user_name"
-                         condition=" f_user_name = '{}'" placeholder='客户名称'>
+                         condition=" f_user_name like '%{}%'" placeholder='客户名称'>
                 </div>
 <!--                <div class="col-sm-2">-->
 <!--                  <label class="font_normal_body">组织机构</label>-->

package/src/filiale/WEINAN/BusinessManage.vue

@@ -70,7 +70,7 @@
       <user-insured v-if="show.includes('用户参保查询')" @deal-msg="dealMsg" :data="data"></user-insured>
     </tabs>
     <tabs header="开户查询" v-if="permission('开户查询')">
-      <new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>
+      <new-account-query v-if="show.includes('开户查询')" @deal-msg="dealMsg"></new-account-query>
     </tabs>
     <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
     <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -113,7 +113,6 @@
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             v-model="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange()"
                             :options='$parent.$parent.userTypes' placeholder='请选择'
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
@@ -411,7 +410,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
           dep:[],
           user:[],
         },
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         //合计数据
@@ -445,14 +443,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
-      userTypeChange () {
-        this.userusetypes = []
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -686,6 +676,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       userTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/ChangeMeterQuery.vue

@@ -164,6 +164,41 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
+                  <v-select :value.sync="model.f_user_usetype" :search="false"
+                            @change="$parent.$parent.userUseTypeChange()"
+                            v-model="model.f_user_usetype"
+                            :options='$parent.$parent.userusetypes'
+                            condition="f_user_usetype = '{}'"
+                            placeholder='用气类型'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_use_institution" class="font_normal_body">用气机构</label>
+                  <v-select :value.sync="model.f_use_institution" :search="false"
+                            @change="$parent.$parent.userUseInstitutionChange()"
+                            v-model="model.f_use_institution"
+                            :options='$parent.$parent.useinstitutions'
+                            condition="f_use_institution = '{}'"
+                            placeholder='用气机构'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
+                  <v-select :value.sync="model.f_user_usenature" :search="false"
+                            v-model="model.f_user_usenature"
+                            :options='$parent.$parent.userusenatures'
+                            condition="f_user_usenature = '{}'"
+                            placeholder='使用性质'
+                            value-single="true"
+                            close-on-select>
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -419,6 +454,8 @@
 
         //合计数据
         sumsmodel: {},
+        useinstitutions: [],
+        userusenatures: [],
         changemeter_fee:[
           {label: '全部', value: ''},
           {label: '销售', value: '> 0'},
@@ -438,6 +475,22 @@
       readySomething(this)
     },
     methods: {
+      userUseInstitutionChange () {
+        this.userusenatures = []
+        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
+        if (this.$refs.paged.$refs.cri.model.f_use_institution) {
+          let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
+          this.userusenatures = this.$appdata.getParam(str)
+        }
+      },
+      userUseTypeChange () {
+        this.useinstitutions = []
+        this.$refs.paged.$refs.cri.model.f_use_institution = ''
+        if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
+          this.useinstitutions = this.$appdata.getParam(str)
+        }
+      },
       view(row){
         this.showupload = true
         this.selected= row
@@ -574,6 +627,9 @@
       }
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       // getstart(){
       //   return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
       // },

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -543,7 +543,6 @@
           {label: '未优惠', value: '= 0'}
         ],
         showupload:false,
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         selected:{},
@@ -650,13 +649,9 @@
       },
       userTypeChange () {
         this.gasproperties=[]
-        this.userusetypes = []
         if(this.$refs.paged.$refs.cri.model !==null) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
         }
         else{
           this.gasproperties =[{label: '全部', value: ''}]
@@ -814,6 +809,9 @@
           orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code'`
         }
       },
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       getfield() {
         return exportConfig.chargeConfig
       },

package/src/filiale/WEINAN/DeviceQuery.vue

@@ -63,7 +63,6 @@
                     <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
                               :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                              @change="$parent.$parent.userTypeChange()"
                               condition="f_user_type = '{}'"
                               close-on-select></v-select>
                   </div>
@@ -436,7 +435,6 @@
           org:[this.$login.f.orgid],
           slice_area: []
         },
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         // 合计数据
@@ -467,14 +465,6 @@
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
-      userTypeChange () {
-        this.userusetypes = []
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       async getinputtores () {
         // 获取抄表员
         let rs = []
@@ -614,6 +604,9 @@
       },
     },
     computed:{
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },

package/src/filiale/WEINAN/DisableQuery.vue

@@ -137,7 +137,6 @@
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             v-model="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange()"
                             :options='$parent.$parent.userTypes' placeholder='请选择'
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
@@ -380,7 +379,6 @@
         //默认打印列
         defaultfield: [],
         tfoot: '',
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         initres: {
@@ -419,14 +417,6 @@
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
-      userTypeChange () {
-        this.userusetypes = []
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       view(row){
         this.showupload = true
         this.selected= row
@@ -577,6 +567,9 @@
       },
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       userTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/EnableQuery.vue

@@ -111,7 +111,6 @@
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             v-model="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange()"
                             :options='$parent.$parent.userTypes' placeholder='请选择'
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
@@ -336,7 +335,6 @@
         tfoot: '',
         //合计数据
         sumsmodel: {},
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         operattype:[{label: '全部', value: ''},{label: '启用', value: '启用'},{label: '复拆表', value: '复拆表'},{label: '销户启用', value: '销户启用'}],
@@ -367,14 +365,6 @@
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
-      userTypeChange () {
-        this.userusetypes = []
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       view(row){
         this.showupload = true
         this.selected= row
@@ -513,6 +503,9 @@
       }
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       userTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/FillGasQuery.vue

@@ -103,7 +103,6 @@
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             v-model="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange()"
                             :options='$parent.$parent.userTypes' placeholder='请选择'
                             condition="f_user_type = '{}'"
                             close-on-select></v-select>
@@ -328,7 +327,6 @@
           user:[],
         },
         showupload:false,
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         selected:{},
@@ -361,14 +359,6 @@
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
-      userTypeChange () {
-        this.userusetypes = []
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       view(row){
         this.showupload = true
         this.selected= row
@@ -512,6 +502,9 @@
       }
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,

package/src/filiale/WEINAN/InspectListUser.vue

@@ -179,41 +179,6 @@
                         condition="f_user_state = '{}'"
                         close-on-select></v-select>
             </div>
-            <div class="col-sm-2 form-group">
-              <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
-              <v-select :value.sync="model.f_user_usetype" :search="false"
-                        @change="$parent.$parent.userUseTypeChange()"
-                        v-model="model.f_user_usetype"
-                        :options='$parent.$parent.userusetypes'
-                        condition="f_user_usetype = '{}'"
-                        placeholder='用气类型'
-                        value-single="true"
-                        close-on-select>
-              </v-select>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="f_use_institution" class="font_normal_body">用气机构</label>
-              <v-select :value.sync="model.f_use_institution" :search="false"
-                        @change="$parent.$parent.userUseInstitutionChange()"
-                        v-model="model.f_use_institution"
-                        :options='$parent.$parent.useinstitutions'
-                        condition="f_use_institution = '{}'"
-                        placeholder='用气机构'
-                        value-single="true"
-                        close-on-select>
-              </v-select>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="f_user_usenature" class="font_normal_body ">使用性质</label>
-              <v-select :value.sync="model.f_user_usenature" :search="false"
-                        v-model="model.f_user_usenature"
-                        :options='$parent.$parent.userusenatures'
-                        condition="f_user_usenature = '{}'"
-                        placeholder='使用性质'
-                        value-single="true"
-                        close-on-select>
-              </v-select>
-            </div>
 
           </div>