manage-client 3.3.58 → 3.3.60

package/package.json

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

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

@@ -402,8 +402,8 @@
           con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
         }
         return {
-          startDate: this.$refs.paged.$refs.cri.model.f_start_date,
-          endDate: this.$refs.paged.$refs.cri.model.f_end_date,
+          startDate: this.$refs.paged.$refs.criteria.model.f_start_date,
+          endDate: this.$refs.paged.$refs.criteria.model.f_end_date,
           condition: con
         }
       }

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

@@ -231,12 +231,6 @@
       //   // this.orgname = obj.res
       // },
       clear() {
-        //清空部门和人员
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
-        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
-        //部门和人员变为全选
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
-        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
         })

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -109,6 +109,50 @@
 <!--                            condition="f_operat_type = '{}'"-->
 <!--                            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_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>
+                </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>
@@ -367,6 +411,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           dep:[],
           user:[],
         },
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         //合计数据
         sumsmodel: {},
         operattype:[{label: '全部', value: ''},{label: '销户', value: '销户'},{label: '销户启用', value: '销户启用'}],
@@ -382,6 +429,30 @@ import {HttpResetClass, PagedList} from 'vue-client'
       })
     },
     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)
+        }
+      },
+      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 = []
@@ -615,6 +686,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
       },
     },
     computed: {
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       getPricenames() {
         let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
         let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -280,6 +280,41 @@
                                   close-on-select :value-single="true" :search="false">
                         </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>
             </div>
@@ -508,6 +543,9 @@
           {label: '未优惠', value: '= 0'}
         ],
         showupload:false,
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         selected:{},
           equip:[]
       }
@@ -529,7 +567,22 @@
 
     },
     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)
+        }
+      },
         async equipment(){
             console.log('=========123123214124=============')
             let condition = `f_orgid = '${this.$login.f.orgid}'`
@@ -597,9 +650,13 @@
       },
       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: ''}]

package/src/filiale/WEINAN/DeviceQuery.vue

@@ -63,6 +63,7 @@
                     <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>
@@ -226,6 +227,41 @@
                     </v-select>
                   </div>
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','slicearea']"></res-select-group>
+                  <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>
@@ -400,6 +436,9 @@
           org:[this.$login.f.orgid],
           slice_area: []
         },
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         // 合计数据
         sumsmodel: {}
       }
@@ -412,6 +451,30 @@
       })
     },
     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)
+        }
+      },
+      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 = []

package/src/filiale/WEINAN/DisableQuery.vue

@@ -133,6 +133,50 @@
                             close-on-select></v-select>
                 </div>
                 <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showCom" @re-res="$parent.$parent.getRes" :cascade =true v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <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>
+                </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>
@@ -336,6 +380,9 @@
         //默认打印列
         defaultfield: [],
         tfoot: '',
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -356,6 +403,30 @@
       })
     },
     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)
+        }
+      },
+      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
@@ -506,6 +577,9 @@
       },
     },
     computed: {
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,

package/src/filiale/WEINAN/EnableQuery.vue

@@ -107,6 +107,50 @@
                             close-on-select></v-select>
                 </div>
                 <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showCom" @re-res="$parent.$parent.getRes"  :cascade =true v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <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>
+                </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>
@@ -292,6 +336,9 @@
         tfoot: '',
         //合计数据
         sumsmodel: {},
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         operattype:[{label: '全部', value: ''},{label: '启用', value: '启用'},{label: '复拆表', value: '复拆表'},{label: '销户启用', value: '销户启用'}],
         showCom:['company','department','operator']
       }
@@ -304,6 +351,30 @@
       })
     },
     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)
+        }
+      },
+      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
@@ -442,6 +513,9 @@
       }
     },
     computed: {
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr,

package/src/filiale/WEINAN/FillGasQuery.vue

@@ -99,6 +99,50 @@
                             condition="f_state = '{}'"
                             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_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>
+                </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>
@@ -284,6 +328,9 @@
           user:[],
         },
         showupload:false,
+        userusetypes: [],
+        useinstitutions: [],
+        userusenatures: [],
         selected:{},
 
         //合计数据
@@ -298,6 +345,30 @@
       })
     },
     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)
+        }
+      },
+      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
@@ -450,6 +521,9 @@
       getfield() {
         return exportConfig.fillgasConfig
       },
+      userTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       fillGasTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('补气类型')]
       },

package/src/filiale/WEINAN/InspectListUser.vue

@@ -179,6 +179,41 @@
                         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>