manage-client 3.2.84-1 → 3.2.87

package/package.json

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

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

@@ -81,7 +81,7 @@
                   </div>
 
                   <div class="col-sm-2 form-group" >
-                    <label class="font_normal_body">用户状态</label>
+                    <label class="font_normal_body">客户状态</label>
                     <v-select :value.sync="model.f_user_state"
                               v-model="model.f_user_state"
                               :options='$parent.$parent.userstates' placeholder='请选择'
@@ -802,8 +802,6 @@
         rowdata:{},
         f_filialeid: this.$login.f.orgid,
         // 下拉框参数
-        userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
-        bandstates:this.$appdata.getParam('微信绑定') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('微信绑定')] : [],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -819,6 +817,7 @@
     },
     ready(){
       this.getaddress()
+      this.$refs.paged.$refs.cri.model.f_user_state=['正常']
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -1142,6 +1141,9 @@
       },
     },
     computed:{
+      bandstates () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('微信绑定')]
+      },
       TableStates () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
@@ -1169,9 +1171,9 @@
       meterbooks(){
         return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
       },
-      // gasproperties() {
-      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      // },
+      userstates() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
+      },
 
       metertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]

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

@@ -575,9 +575,7 @@
           f_userinfo_code: '',
           f_filialeids: ''
         },
-        hairpin:this.$appdata.getParam('发卡状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('发卡状态')]:[],
-        addressstate:this.$appdata.getParam('地址状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]:[],
-        userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
+
         show:false,
         rowdata:{},
         meterInfo:{},
@@ -598,7 +596,7 @@
     },
     ready() {
        this.getaddress()
-
+      this.$refs.paged.$refs.cri.model.f_user_state=['正常']
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -918,6 +916,12 @@
       },
       userTypes () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      hairpin() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('发卡状态')]
+      },
+      addressstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
       }
     }
   }