manage-client 3.3.62 → 3.3.64

package/src/filiale/WEINAN/filesquery/UserDeviceQuery.vue

@@ -128,7 +128,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>
@@ -307,7 +306,6 @@
           dep:[],
           user:[],
         },
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         // 合计数据
@@ -338,14 +336,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)
-        }
-      },
       getotherfooter () {
         // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
@@ -471,6 +461,9 @@
       },
     },
     computed:{
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       userTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -75,7 +75,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>
@@ -458,7 +457,6 @@
 
         //合计数据
         sumsmodel: {},
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         changemeter_fee:[
@@ -498,14 +496,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
@@ -657,6 +647,9 @@
       changeTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
       },
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       userTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/webmeter/LostContactAnalysisList.vue

@@ -428,7 +428,6 @@
           {label: '全部', value: ''}
         ],
         styles:false,
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         filename: '',
@@ -516,7 +515,6 @@
         }
       },
       userTypeChange () {
-        this.userusetypes = []
         this.gasproperties=[{label: '全部', value: ''}]
         if(this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
@@ -524,9 +522,6 @@
           console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
           // this.gasproperties.push({label: '全部', value: ''})
-          this.$refs.paged.$refs.cri.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
         }
         else{
           this.gasproperties =[{label: '全部', value: ''}]
@@ -640,6 +635,9 @@
         }
 
       },
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/webmeter/NewQueryInstruct.vue

@@ -158,7 +158,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.userType' placeholder='请选择'
                           condition="f_user_type = '{}'"
                           close-on-select></v-select>
@@ -377,7 +376,6 @@
         f_start_date:'',
         f_end_date:'',
         getfield: {},
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         config: {
@@ -415,14 +413,6 @@
           this.useinstitutions = this.$appdata.getParam(str)
         }
       },
-      userTypeChange () {
-        this.userusetypes = []
-        if(this.$refs.paged.$refs.criteria.model !==null) {
-          this.$refs.paged.$refs.criteria.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.criteria.model.f_user_type[0] + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       hidden(){
         this.criteriaShow = !this.criteriaShow
       },
@@ -539,6 +529,9 @@
 
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
      userType () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/WEINAN/webmeter/ReportList.vue

@@ -284,7 +284,6 @@
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         orgCondtionStr: '',
@@ -349,13 +348,9 @@
       },
       userTypeChange () {
         this.gasproperties=[]
-        this.userusetypes = []
         if(this.$refs.paged.$refs.criteria.model !==null) {
           this.$refs.paged.$refs.criteria.model.f_gasproperties=''
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
-          this.$refs.paged.$refs.criteria.model.f_use_institution = ''
-          let str = this.$refs.paged.$refs.criteria.model.f_user_type + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
         }
         else{
           this.gasproperties =[{label: '全部', value: ''}]
@@ -408,6 +403,9 @@
       }
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       getPricenames() {
         let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
         let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;

package/src/filiale/WEINAN/webmeter/TotalExceptionByMeter.vue

@@ -401,7 +401,6 @@
           dep:[],
           user:[]
         },
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         condition: '1=1',
@@ -474,16 +473,12 @@
         this.styles = true
       },
       userTypeChange () {
-        this.userusetypes = []
         this.gasproperties=[{label: '全部', value: ''}]
         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 = ''
           if(this.$refs.paged.$refs.cri.model.f_user_type){
             console.log(this.$refs.paged.$refs.cri.model.f_user_type)
             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)
           }
           // this.gasproperties.push({label: '全部', value: ''})
         }
@@ -623,6 +618,9 @@
       }
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       // usertypes () {
       //   return this.$appdate.getParams("客户类型")
       // },

package/src/filiale/WEINAN/webmeter/UserInstructList.vue

@@ -247,7 +247,6 @@
         criteriaShow: false,
         echarts: false,
         searchshow: false,
-        userusetypes: [],
         useinstitutions: [],
         userusenatures: [],
         orgCondtionStr: '(' + this.$login.f.orgid + ')',
@@ -277,7 +276,6 @@
         }
       },
       userTypeChange () {
-        this.userusetypes = []
         this.gasproperties=[{label: '全部', value: ''}]
         if(this.$refs.paged.$refs.cri.model !==null) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
@@ -285,9 +283,6 @@
           console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
           // this.gasproperties.push({label: '全部', value: ''})
-          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)
 
         }
         else{
@@ -351,6 +346,9 @@
       // }
     },
     computed: {
+      userusetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       getCondition() {
         var con=""
         if (this.orgCondtionStr) {

package/src/filiale/kelai/ChargeQuery.vue

@@ -63,7 +63,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 form-group">
                   <label class="font_normal_body">收费编号</label>

package/src/filiale/kelai/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/filiale/kelai/NewAccountQuery.vue

@@ -35,7 +35,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 form-group">-->
 <!--                  <label class="font_normal_body">公&ensp;&ensp;司</label>-->

package/src/filiale/kelai/UserQuery.vue

@@ -15,7 +15,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 form-group">
                     <label class="font_normal_body" title="旧客户编号">档案编号</label>

package/src/filiale/ningjin/ManageSellType.vue

@@ -204,7 +204,7 @@
           this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString()}')`
         }
         if(this.f_operatorid[0]) {
           this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`

package/src/filiale/shiquan/ManageSellType.vue

@@ -200,22 +200,33 @@
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
-        if (this.depname === null || this.depname === '' || this.depname === undefined) {
+        if (this.f_depid.length < 1) {
           this.$showAlert('请选择部门之后再进行查询！', 'warning', 3000)
           return
         }
-        if (this.f_orgid[0]) {
-          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
+        if (this.f_orgid.length > 0) {
+          this.orgCondtionStr += ` and f_orgid   in (${this.getParamStr(this.f_orgid)})`
         }
-        if (this.f_depid[0]) {
-          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
+        if (this.f_depid.length > 0) {
+          this.orgCondtionStr += ` and f_depid   in (${this.getParamStr(this.f_depid)})`
         }
-        if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`
+        if (this.f_operatorid.length > 0) {
+          this.orgCondtionStr += ` and f_operatorid   in (${this.getParamStr(this.f_operatorid)})`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)
       },
+      getParamStr (array) {
+        let stringValue = ''
+        for (let i = 0; i < array.length; i++) {
+          if (i === array.length - 1) {
+            stringValue = stringValue + "'" + array[i] + "'"
+          } else {
+            stringValue = stringValue + "'" + array[i] + "',"
+          }
+        }
+        return stringValue
+      },
       getRes (obj) {
         this.orgname = obj.res[0]
         this.depresid = obj.resids

package/src/filiale/zhongyi/ManageSellType.vue

@@ -204,7 +204,7 @@
           this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString()}')`
         }
         if(this.f_operatorid[0]) {
           this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`