manage-client 4.1.157 → 4.1.159

package/package.json

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

package/src/filiale/shiquan/InspectListUser.vue

@@ -167,6 +167,19 @@
               <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                      condition="f_address like '%{}%'" placeholder='客户地址'>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+              <v-select :value.sync="model.f_residential_area_id"
+                        class="select_list select"
+                        enter-push :disabled="$parent.$parent.isAreaShow"
+                        v-model="model.f_residential_area_id"
+                        multiple="true"
+                        @select-search="$parent.$parent.getAreaList"
+                        :options='$parent.$parent.residentialArea'
+                        placeholder='小区'
+                        condition="f_residential_area_id in {}">
+              </v-select>
+            </div>
             <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_phone"
@@ -406,7 +419,7 @@
   /**
    *用户档案查询列表以及添加操作组件
    */
-  import { PagedList } from 'vue-client'
+  import {HttpResetClass, PagedList} from 'vue-client'
   import Vue from 'vue'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
@@ -442,6 +455,8 @@
         sqlName:'inspectList',
         rowdata:{},
         sumsmodel: {},
+        //小区
+        residentialArea: [],
         config: {
           defaultPrint: ['f_userinfo_code','f_user_id']
         },
@@ -513,7 +528,7 @@
       }
     },
     ready () {
-
+      this.getAreaList()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -600,6 +615,27 @@
           this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
         }
       },
+      getAreaList (searchText) {
+        let condition = `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+        if (searchText) {
+          condition = condition + ` and f_residential_area like '%${searchText}%' `
+        }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist?pageNo=1&pageSize=100', {
+          data: {
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
+          let redata = []
+          req.data.forEach((row, n) => {
+            redata[n] = {
+              label: row.f_residential_area,
+              value: row.id
+            }
+          })
+          this.residentialArea = [{label: '全部', value: ''}, ...redata]
+        })
+      },
       userTypeChange () {
         this.gasproperties=[]
         if(this.$refs.paged.$refs.cri.model !==null) {

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -392,7 +392,7 @@
                             close-on-select></v-select>
                 </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_is_empty"
                             :options='$parent.$parent.isempty'
                             placeholder='请选择'
@@ -606,7 +606,7 @@
                   <th><nobr>是否煤改气</nobr></th>
                   <th><nobr>是否空置户</nobr></th>
                   <th><nobr>是否孤寡老人</nobr></th>
-                  <th><nobr>是否空房</nobr></th>
+                  <th><nobr>客户最新状态</nobr></th>
                   <th><nobr>附件</nobr></th>
               </tr>
             </template>
@@ -1042,7 +1042,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
         tempfalg :false,
         lastorgstr:'',
         // pos设备列表

package/src/filiale/tongchuan/GasInspection.vue

@@ -289,7 +289,7 @@
                         close-on-select></v-select>
             </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_is_empty"
                         :options='$parent.$parent.isempty'
                         placeholder='请选择'
@@ -339,7 +339,7 @@
             <th><nobr>是否煤改气</nobr></th>
             <th><nobr>是否空置户</nobr></th>
             <th><nobr>是否孤寡老人</nobr></th>
-            <th><nobr>是否空房</nobr></th>
+            <th><nobr>客户最新状态</nobr></th>
           </tr>
         </template>
         <template partial='body'>
@@ -497,7 +497,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
         meterbrands: [],
         // 表册片区
         bookSlice:[],
@@ -800,7 +800,7 @@
           'f_is_mgq': '是否煤改气',
           'f_is_vacant': '是否空置户',
           'f_is_alone': '是否孤寡老人',
-          'f_is_empty': '是否空房'
+          'f_is_empty': '客户最新状态'
         }
       },
       usertypes() {

package/src/filiale/tongchuan/HandplanQuery.vue

@@ -330,7 +330,7 @@
                             close-on-select></v-select>
                 </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_is_empty"
                             :options='$parent.$parent.isempty'
                             placeholder='请选择'
@@ -468,7 +468,7 @@
                 <th><nobr>是否煤改气</nobr></th>
                 <th><nobr>是否空置户</nobr></th>
                 <th><nobr>是否孤寡老人</nobr></th>
-                <th><nobr>是否空房</nobr></th>
+                <th><nobr>客户最新状态</nobr></th>
                 <th>
                   <nobr>抄表状态</nobr>
                 </th>
@@ -860,7 +860,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
         imgshow:false,
         imgfilename:'',
         percent:0,

package/src/filiale/tongchuan/InspectListGas.vue

@@ -319,7 +319,7 @@
                             close-on-select></v-select>
                 </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_is_empty"
                             :options='$parent.$parent.isempty'
                             placeholder='请选择'
@@ -369,7 +369,7 @@
                 <th><nobr>是否煤改气</nobr></th>
                 <th><nobr>是否空置户</nobr></th>
                 <th><nobr>是否孤寡老人</nobr></th>
-                <th><nobr>是否空房</nobr></th>
+                <th><nobr>客户最新状态</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -475,7 +475,7 @@
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
           "f_changemeter_date":"最后一次换表时间","sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构",
-          "f_is_mgq": "是否煤改气", "f_is_empty": "是否空房", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"},
+          "f_is_mgq": "是否煤改气", "f_is_empty": "客户最新状态", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"},
         model: new PagedList('api/af-revenue/sql/inspectList_sellinggas', 50,{},{sellpregas: 0}),
         rows: null,
         //orgid:'',
@@ -496,7 +496,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : []
       }
     },
     watch:{
@@ -516,7 +516,7 @@
             "delivery_date":"最后购气日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
             "f_changemeter_date":"最后一次换表时间",
             "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构",
-            "f_is_mgq": "是否煤改气", "f_is_empty": "是否空房", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"}
+            "f_is_mgq": "是否煤改气", "f_is_empty": "客户最新状态", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"}
         }if(val == '物联网表'){
           this.url = 'api/af-revenue/sql/getwulw_listgas'
           this.sqlName = 'getwulw_listgas'
@@ -526,7 +526,7 @@
             "delivery_date":"最后购气日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
             "f_changemeter_date":"最后一次换表时间",
             "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构",
-            "f_is_mgq": "是否煤改气", "f_is_empty": "是否空房", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"}
+            "f_is_mgq": "是否煤改气", "f_is_empty": "客户最新状态", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"}
         }
         if(val == '机表'){
           this.url = 'api/af-revenue/sql/handinspectList_sellinggas'
@@ -537,7 +537,7 @@
             "delivery_date":"最后抄表日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
             "f_changemeter_date":"最后一次换表时间",
             "sellcishu":"期间抄表次数","sellpregas":"期间抄表气量","f_orgname":"组织机构",
-            "f_is_mgq": "是否煤改气", "f_is_empty": "是否空房", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"}
+            "f_is_mgq": "是否煤改气", "f_is_empty": "客户最新状态", "f_is_vacant": "是否空置户", "f_is_alone": "是否孤寡老人"}
         }
         this.clear()
       }

package/src/filiale/tongchuan/InspectListUser.vue

@@ -231,7 +231,7 @@
                             close-on-select></v-select>
                 </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_is_empty"
                             :options='$parent.$parent.isempty'
                             placeholder='请选择'
@@ -279,7 +279,7 @@
                 <th><nobr>是否煤改气</nobr></th>
                 <th><nobr>是否空置户</nobr></th>
                 <th><nobr>是否孤寡老人</nobr></th>
-                <th><nobr>是否空房</nobr></th>
+                <th><nobr>客户最新状态</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -512,7 +512,7 @@ export default {
         "delivery_date":"区间内最后购气日期","cishu":"区间内购气次数","pregas":"区间内购气量","collection":"区间内购气金额",
         "diffday":"区间内未购气天数","f_checknum":"安检次数","f_last_check_date":"最后安检日期",
         "f_is_mgq": "是否煤改气",
-        "f_is_empty": "是否空房",
+        "f_is_empty": "客户最新状态",
         "f_is_vacant": "是否空置户",
         "f_is_alone": "是否孤寡老人"},
       model: new PagedList('api/af-revenue/sql/inspectList', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0}),
@@ -547,7 +547,7 @@ export default {
       ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
       isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
       isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-      isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+      isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
       batchQuotaModalShow: false,
       defaultfield: [],
     }
@@ -578,7 +578,7 @@ export default {
           "f_checknum": "安检次数",
           "f_last_check_date": "最后安检日期",
           "f_is_mgq": "是否煤改气",
-          "f_is_empty": "是否空房",
+          "f_is_empty": "客户最新状态",
           "f_is_vacant": "是否空置户",
           "f_is_alone": "是否孤寡老人"
         }
@@ -607,7 +607,7 @@ export default {
           "f_checknum": "安检次数",
           "f_last_check_date": "最后安检日期",
           "f_is_mgq": "是否煤改气",
-          "f_is_empty": "是否空房",
+          "f_is_empty": "客户最新状态",
           "f_is_vacant": "是否空置户",
           "f_is_alone": "是否孤寡老人"
         }
@@ -636,7 +636,7 @@ export default {
           "f_checknum": "安检次数",
           "f_last_check_date": "最后安检日期",
           "f_is_mgq": "是否煤改气",
-          "f_is_empty": "是否空房",
+          "f_is_empty": "客户最新状态",
           "f_is_vacant": "是否空置户",
           "f_is_alone": "是否孤寡老人"
         }

package/src/filiale/tongchuan/MeterQuery.vue

@@ -336,7 +336,7 @@
                               close-on-select></v-select>
                   </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_is_empty"
                               :options='$parent.$parent.isempty'
                               placeholder='请选择'
@@ -429,7 +429,7 @@
                   <th><nobr>是否煤改气</nobr></th>
                   <th><nobr>是否空置户</nobr></th>
                   <th><nobr>是否孤寡老人</nobr></th>
-                  <th><nobr>是否空房</nobr></th>
+                  <th><nobr>客户最新状态</nobr></th>
                 </tr>
               </template>
               <template partial='body'>
@@ -660,7 +660,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
         usetype:this.$appdata.getParam('使用类型'),
         userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
       }

package/src/filiale/tongchuan/RecordInfoQuery.vue

@@ -566,10 +566,10 @@
                               close-on-select></v-select>
                   </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_is_empty"
                               :options='$parent.$parent.isempty'
-                              placeholder='请选择'
+                              placeholder='客户最新状态'
                               v-model="model.f_is_empty"
                               condition="f_is_empty = '{}'"
                               close-on-select></v-select>
@@ -736,7 +736,7 @@
                   <th><nobr>是否煤改气</nobr></th>
                   <th><nobr>是否空置户</nobr></th>
                   <th><nobr>是否孤寡老人</nobr></th>
-                  <th><nobr>是否空房</nobr></th>
+                  <th><nobr>客户最新状态</nobr></th>
                   <th><nobr>是否发放天然气使用证</nobr></th>
 
                   <th><nobr>使用类型</nobr></th>
@@ -1063,7 +1063,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
         networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
       }
     },

package/src/filiale/tongchuan/UserQuery.vue

@@ -343,10 +343,10 @@
                               close-on-select></v-select>
                   </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_is_empty"
                               :options='$parent.$parent.isempty'
-                              placeholder='请选择'
+                              placeholder='客户最新状态'
                               v-model="model.f_is_empty"
                               condition="f_is_empty = '{}'"
                               close-on-select></v-select>
@@ -381,6 +381,7 @@
                     <data-order field="f_address" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                   </th>
+                  <th><nobr>客户最新状态</nobr></th>
                   <th>
                     <nobr>小区</nobr>
                   </th>
@@ -438,7 +439,7 @@
                   <th><nobr>是否煤改气</nobr></th>
                   <th><nobr>是否空置户</nobr></th>
                   <th><nobr>是否孤寡老人</nobr></th>
-                  <th><nobr>是否空房</nobr></th>
+
 <!--                  <th>-->
 <!--                    <nobr>部门</nobr>-->
 <!--                  </th>-->
@@ -469,6 +470,7 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
+                <th style="text-align: center;"><nobr>{{row.f_is_empty}}</nobr></th>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_residential_area}}</nobr>
                 </td>
@@ -526,7 +528,7 @@
                 <th style="text-align: center;"><nobr>{{row.f_is_mgq}}</nobr></th>
                 <th style="text-align: center;"><nobr>{{row.f_is_vacant}}</nobr></th>
                 <th style="text-align: center;"><nobr>{{row.f_is_alone}}</nobr></th>
-                <th style="text-align: center;"><nobr>{{row.f_is_empty}}</nobr></th>
+
 <!--                <td style="text-align: center;">-->
 <!--                  <nobr>{{row.f_depname}}</nobr>-->
 <!--                </td>-->
@@ -657,7 +659,7 @@
         ismgq: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isvacant: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         isalone: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
-        isempty: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
+        isempty: this.$appdata.getParam('客户最新状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户最新状态')] : [],
         weixinSign:[{label:"全部",value:""},{label:"已绑定",value:"已绑定"},{label:"未绑定",value:"未绑定"}],
         //小区
         residentialArea: [],

package/src/filiale/tongchuan/config/exportConfig.js

@@ -2,12 +2,12 @@
 export default{
   // 把打印需要默认选中的字段名放在config数组中
   userConfig: { 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话',
-    'f_idnumber': '身份证号', 'f_balance': '账户余额', 'f_address': '客户地址', 'f_residential_area': '小区',
+    'f_idnumber': '身份证号', 'f_balance': '账户余额', 'f_address': '客户地址', 'f_is_empty': '客户最新状态', 'f_residential_area': '小区',
     'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号',
     'f_user_state': '客户状态', 'f_createfile_date': '建档日期', 'f_open_date': '户档案开户日期', 'f_open_date_uf': '户档案开户日期', 'f_createfile_person': '建档人', 'f_comments': '备注',
     'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号', 'f_inputtor': '抄表员',
     'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_gas_date': '点火时间', 'isbgl': '是否壁挂炉',
-    'f_is_mgq': '是否煤改气', 'f_is_empty': '是否空房', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
+    'f_is_mgq': '是否煤改气', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
   },
   // 操作记录查询
   recordConfig: {
@@ -35,7 +35,7 @@ export default{
     'value': '气价详情', 'f_meter_brand': '气表品牌', 'f_meter_style': '气表型号',
     'f_gas_person': '通气人', 'f_gas_date': '通气时间', 'f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉', 'f_inputtor': '抄表员', 'f_book_name': '抄表册',
     'f_user_state': '客户状态',
-    'f_is_mgq': '是否煤改气', 'f_is_empty': '是否空房', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
+    'f_is_mgq': '是否煤改气', 'f_is_empty': '客户最新状态', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
   },
   ResidentialQuery: {
     'f_residential_area': '小区', 'hushu': '户数', 'xinhushu': '新建户数', 'f_oughtfee': '用气金额', 'f_oughtamount': '用气量',
@@ -74,7 +74,7 @@ export default{
     'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员', 'f_serial_id': '流水号', 'f_tax_logotype': '是否征税', 'f_terminal_num': '终端号',
-    'f_is_mgq': '是否煤改气', 'f_is_empty': '是否空房', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
+    'f_is_mgq': '是否煤改气', 'f_is_empty': '客户最新状态', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'
@@ -234,7 +234,7 @@ export default{
     'latest_f_pregas': '最后购气量',
     'latest_f_collection': '最后购气金额',
     'f_max_operate_date': '最后购气日期',
-    'f_is_empty': '是否空房', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
+    'f_is_empty': '客户最新状态', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
   },
 
   compreConfigGY: {
@@ -322,7 +322,7 @@ export default{
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
     'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_rest_date': '所属年月',
-    'f_is_mgq': '是否煤改气', 'f_is_empty': '是否空房', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
+    'f_is_mgq': '是否煤改气', 'f_is_empty': '客户最新状态', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
   },
   balanceConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_balance': '期初余额', 'f_oughtfee': '期间应收',

package/src/filiale/wuhai/UserGasList.vue

@@ -5,6 +5,46 @@
         <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户编号</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_userinfo_code" placeholder='客户编号'
+                       condition="u.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <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 like '%{}%'" v-next-el='userid' v-el:username>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户地址</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_address" placeholder='地址'
+                       condition="a.f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表&emsp;&emsp;号</label>
+                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                       v-model="model.f_meternumber" placeholder='表钢号'
+                       condition="uf.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                >
+              </div>
+              <div class="span" style="float:right;margin-top:10px">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+                <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getNewHandChanceList" template-name='抄表分析'
+                              :choose-col="true"></export-excel>
+                <button class="button_export button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+                <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
                 <right-tree @re-res="$parent.$parent.getRes"
@@ -16,6 +56,9 @@
                 <!--                            restype='organization'>-->
                 <!--                </res-select>-->
               </div>
+              <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+              <!--              <res-select-group :initres="$parent.$parent.initres"  :show-component="['company']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">用户类型</label>
                 <v-select style="width:60%" id="f_user_type"
@@ -28,6 +71,17 @@
                           close-on-select>
                 </v-select>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">用气性质</label>
+                <v-select style="width:60%" id="f_gasproperties"
+                          v-model="model.f_gasproperties"
+                          placeholder='用气性质'
+                          :value.sync="model.f_gasproperties"
+                          :options='$parent.$parent.gasproperties'
+                          condition="uf.f_gasproperties = '{}'"
+                          close-on-select>
+                </v-select>
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">气表品牌</label>
                 <v-select
@@ -41,19 +95,37 @@
                   v-model="model.f_meter_brand">
                 </v-select>
               </div>
-
-              <div class="span" style="float:right;margin-top:10px">
-                <button class="button_search button_spacing" @click="search()">查询</button>
-                <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
-                <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
-                              :field="$parent.$parent.getfield"
-                              sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getNewHandChanceList" template-name='抄表分析'
-                              :choose-col="true"></export-excel>
-                <button class="button_export button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
-                <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
+              <!--              <div class="col-sm-2 form-group">-->
+              <!--                <label class="font_normal_body">气表品牌</label>-->
+              <!--                <v-select-->
+              <!--                  placeholder='气表品牌'-->
+              <!--                  :value.sync="model.f_meter_brand"-->
+              <!--                  v-model="model.f_meter_brand"-->
+              <!--                  :options='$parent.$parent.WarningType'-->
+              <!--                  @change="$parent.$parent.getMeterType"-->
+              <!--                  close-on-select-->
+              <!--                  condition="gb.f_meter_brand='{}'">-->
+              <!--                </v-select>-->
+              <!--              </div>-->
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body">气表型号</label>
+                <v-select
+                  placeholder='气表型号'
+                  :value.sync="model.f_meter_style"
+                  v-model="model.f_meter_style"
+                  :options='$parent.$parent.meterstyle[model.f_meter_brand]'
+                  close-on-select
+                  condition="gm.f_meter_style='{}'">
+                </v-select>
+                <!--                <v-select v-if="!$parent.$parent.styles"-->
+                <!--                          placeholder='气表型号'-->
+                <!--                          :value.sync="model.f_meter_style"-->
+                <!--                          v-model="model.f_meter_style"-->
+                <!--                          :options='$parent.$parent.Warningstyles'-->
+                <!--                          close-on-select-->
+                <!--                          condition="f_meter_style='{}'">-->
+                <!--                </v-select>-->
               </div>
-            </div>
-            <div class="row" v-show="$parent.$parent.criteriaShow">
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body" style="word-break:keep-all;">上报时间</label>
                 <datepicker style="width:60%" placeholder="起始时间"
@@ -70,6 +142,48 @@
                             :format="'yyyy-MM-dd HH:mm:ss'"
                 ></datepicker>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气价类型</label>
+                <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                          @change="$parent.$parent.pricetypechanged"
+                          placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                          close-on-select v-ref:type>
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气价名称</label>
+                <v-select :value.sync="model.f_price_id"
+                          v-model="model.f_price_id"
+                          :multiple="true"
+                          :options="$parent.$parent.getPricenames"
+                          condition="uf.f_price_id in {}"
+                ></v-select>
+              </div>
+              <!--              <div class="col-sm-2 form-group">-->
+              <!--                <label class="font_normal_body">壁&ensp;挂&ensp;炉</label>-->
+              <!--                <v-select id="f_meter_brand"-->
+              <!--                          v-model="model.f_usetype"-->
+              <!--                          placeholder='壁挂炉'-->
+              <!--                          :value.sync="model.f_usetype"-->
+              <!--                          :options='$parent.$parent.usetypes'-->
+              <!--                          condition="" :search="false"-->
+              <!--                          close-on-select style="width: 60%">-->
+              <!--                </v-select>-->
+              <!--              </div>-->
+              <!--              <div class="col-sm-2 form-group">-->
+              <!--                <label class="font_normal_body">房屋类型</label>-->
+              <!--                <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"-->
+              <!--                          :options='$parent.$parent.houseTypes' placeholder='请选择'-->
+              <!--                          close-on-select-->
+              <!--                          condition=""></v-select>-->
+              <!--              </div>-->
+              <!--              <div class="col-sm-2 form-group">-->
+              <!--                <label class="font_normal_body">安装位置</label>-->
+              <!--                <v-select :value.sync="model.f_position" v-model="model.f_position"-->
+              <!--                          :options='$parent.$parent.positions' placeholder='请选择'-->
+              <!--                          condition=""-->
+              <!--                          close-on-select></v-select>-->
+              <!--              </div>-->
             </div>
           </div>
         </criteria>
@@ -80,10 +194,10 @@
               <th style="text-align:center"><nobr>上报日期</nobr></th>
               <th style="text-align:center" title="安装户数=正常户数+停用户数+未注册户数"><nobr>安装户数</nobr></th>
 
-<!--              <th style="text-align:center" title="停用户数:表具状态为停用的用户数"><nobr>停用户数</nobr></th>-->
-<!--              <th style="text-align:center" title="在用户数:表具状态为正常的用户数"><nobr>在用户数</nobr></th>-->
+              <!--              <th style="text-align:center" title="停用户数:表具状态为停用的用户数"><nobr>停用户数</nobr></th>-->
+              <!--              <th style="text-align:center" title="在用户数:表具状态为正常的用户数"><nobr>在用户数</nobr></th>-->
 
-<!--              <th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>-->
+              <!--              <th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>-->
               <th style="text-align:center"><nobr>抄表成功户数</nobr></th>
               <th style="text-align:center"><nobr>总用气量</nobr></th>
               <th style="text-align:center"><nobr>总用气金额</nobr></th>
@@ -100,10 +214,10 @@
               <td style="text-align:center;width: 170px;"><nobr>{{row.f_insert_date}}</nobr></td>
               <td style="text-align:center">{{row.anzhuang}}</td>
 
-<!--              <th style="text-align:center">{{row.c0}}</th>-->
-<!--              <td style="text-align:center"><nobr>{{row.c}}</nobr></td>-->
+              <!--              <th style="text-align:center">{{row.c0}}</th>-->
+              <!--              <td style="text-align:center"><nobr>{{row.c}}</nobr></td>-->
 
-<!--              <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>-->
+              <!--              <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>-->
               <!--<td style="text-align:center"><nobr>{{row.f_gas}}</nobr></td>-->
               <td style="text-align:center">{{row.c1}}</td>
               <td style="text-align:center">{{row.f_gas_all}}</td>
@@ -132,9 +246,9 @@
         </tr>
       </table>
     </div>
-<!--    <div style="height: 40px;width: 100%;" v-show="echarts">-->
-<!--      <button class="button_search button_spacing" @click="showEcharts()">隐藏图表</button>-->
-<!--    </div>-->
+    <!--    <div style="height: 40px;width: 100%;" v-show="echarts">-->
+    <!--      <button class="button_search button_spacing" @click="showEcharts()">隐藏图表</button>-->
+    <!--    </div>-->
 
   </div>
   <!--图显示模板-->
@@ -144,275 +258,275 @@
   </div>
 </template>
 <script>
-  import {HttpResetClass, PagedList} from 'vue-client'
-  import UserGasEcharts from './UserGasEchartsList'
-  import * as Util from '../../Util'
-  import plugins from '../../plugins/GetLoginInfoService'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-  let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-    await self.$MagLoadParams.loadParam()
-    self.initQueryParam()
-    self.$refs.paged.$refs.cri.search()
-  }
-  export default {
-    title: '抄表分析',
-    props: ['data'],
-    components: {UserGasEcharts},
-    data () {
-      return {
-        resshow:['slicearea'],
-        prices: [],
-        model: new PagedList('api/af-revenue/sql/webmeter_getNewHandChanceList', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
-          f_gas_all: 0,
-          f_fee_all: 0
-        }),
-        condition: '1=1',
-        startDate: '',
-        gasproperties:[{label: '全部', value: ''}],
-        endDate: '',
-        meterbrand: [],
-        meterstyle: {},
-        WarningType: [
-          {label: '全部', value: ''}
-        ],
-        Warningstyles: [
-          {label: '全部', value: ''}
-        ],
-        styles:false,
-        orgid:[this.$login.f.orgid],
-        getfield:{
-          "rownumber":"序号",
-          "f_insert_date":"上报日期",
-          "anzhuang":"安装户数",
-          "c1":"抄表成功户数",
-          "f_gas_all":"总用气量",
-          "f_fee_all":"总用气金额",
-          "f_gas":"日均户均用气量(成功)",
-          "f_gas1":"日均户均用气量(在用)",
-          "f_bv1":"抄表成功率"
-        },
-        criteriaShow:false,
-        echarts: false,
-        orgCondtionStr: '(\'' + this.$login.f.orgid + '\')',
-        searchshow: false,
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        zonesdata:'',
-        obj: {
-          userid: this.$login.f.id,
-          source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-          res: this.$login.f.f_fengongsi,
-          resids: this.$login.f.orgid
-        },
-        f_filialeid: this.$login.f.orgid,
-        usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
-      }
-    },
-    ready () {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      initQueryParam () {
-        let meters = this.$MagGetSaleParam.getGasbrand().filter(item => item.value.f_meter_type==='物联网表')
-        let arr = meters.map(res => {
-          let sty = res.value.gasmodel.map(row => {
-            return {
-              label: row.label,
-              value: row.value.f_meter_style
-            }
-          })
-          this.meterstyle[res.value.f_meter_brand] = [{label: '全部', value: ''}, ...sty]
-          return {
-            label: res.label,
-            value: res.value.f_meter_brand
-          }
-        })
-        this.meterbrand = [{label: '全部', value: ''}, ...arr]
-        //初始化气表价格
-        this.prices = this.$MagGetSaleParam.getPrices()
+import {HttpResetClass, PagedList} from 'vue-client'
+import UserGasEcharts from './UserGasEchartsList'
+import * as Util from '../../Util'
+import plugins from '../../plugins/GetLoginInfoService'
+import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+  await self.$MagLoadParams.loadParam()
+  self.initQueryParam()
+  self.$refs.paged.$refs.cri.search()
+}
+export default {
+  title: '抄表分析',
+  props: ['data'],
+  components: {UserGasEcharts},
+  data () {
+    return {
+      resshow:['slicearea'],
+      prices: [],
+      model: new PagedList('api/af-revenue/sql/webmeter_getNewHandChanceList', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        f_gas_all: 0,
+        f_fee_all: 0
+      }),
+      condition: '1=1',
+      startDate: '',
+      gasproperties:[{label: '全部', value: ''}],
+      endDate: '',
+      meterbrand: [],
+      meterstyle: {},
+      WarningType: [
+        {label: '全部', value: ''}
+      ],
+      Warningstyles: [
+        {label: '全部', value: ''}
+      ],
+      styles:false,
+      orgid:[this.$login.f.orgid],
+      getfield:{
+        "rownumber":"序号",
+        "f_insert_date":"上报日期",
+        "anzhuang":"安装户数",
+        "c1":"抄表成功户数",
+        "f_gas_all":"总用气量",
+        "f_fee_all":"总用气金额",
+        "f_gas":"日均户均用气量(成功)",
+        "f_gas1":"日均户均用气量(在用)",
+        "f_bv1":"抄表成功率"
       },
-      showMeterStyle() {
-        this.styles = true
+      criteriaShow:false,
+      echarts: false,
+      orgCondtionStr: '(\'' + this.$login.f.orgid + '\')',
+      searchshow: false,
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[]
       },
-      userTypeChange () {
-        this.gasproperties=[{label: '全部', value: ''}]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-
-          if(this.$refs.paged.$refs.cri.model.f_user_type && this.$refs.paged.$refs.cri.model.f_user_type.length>0){
-            this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      zonesdata:'',
+      obj: {
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        res: this.$login.f.f_fengongsi,
+        resids: this.$login.f.orgid
+      },
+      f_filialeid: this.$login.f.orgid,
+      usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}]
+    }
+  },
+  ready () {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    initQueryParam () {
+      let meters = this.$MagGetSaleParam.getGasbrand().filter(item => item.value.f_meter_type==='物联网表')
+      let arr = meters.map(res => {
+        let sty = res.value.gasmodel.map(row => {
+          return {
+            label: row.label,
+            value: row.value.f_meter_style
           }
-          // this.gasproperties.push({label: '全部', value: ''})
-        }
-        else{
-          this.gasproperties =[{label: '全部', value: ''}]
+        })
+        this.meterstyle[res.value.f_meter_brand] = [{label: '全部', value: ''}, ...sty]
+        return {
+          label: res.label,
+          value: res.value.f_meter_brand
         }
-      },
-      hidden(){
-        this.criteriaShow = !this.criteriaShow
-      },
-      // 查询开关
-      seachchange () {
-        this.searchshow = !this.searchshow
-      },
+      })
+      this.meterbrand = [{label: '全部', value: ''}, ...arr]
+      //初始化气表价格
+      this.prices = this.$MagGetSaleParam.getPrices()
+    },
+    showMeterStyle() {
+      this.styles = true
+    },
+    userTypeChange () {
+      this.gasproperties=[{label: '全部', value: ''}]
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
 
-      // 显示柱状图
-      showEcharts () {
-        this.echarts = !this.echarts
-        console.log(this.echarts)
-      },
-      close () {
-        this.show = false
-      },
-      // SaveAsFile(str) {
-      //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
-      //     if (res === 'confirm') {
-      //       let style = '<style>' +
-      //         'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;}  .tdcenter{text-align: center;}</style>';
-      //       let strHtml = style + document.getElementById(str).innerHTML;
-      //       console.log(strHtml);
-      //       let LODOP = getLodop();
-      //       LODOP.PRINT_INIT('');
-      //       LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
-      //       LODOP.SAVE_TO_FILE('抄表统计.xls')
-      //     }
-      //   })
-      // },
-      clearmsg () {
-        this.$refs.paged.$refs.cri.model = {}
-        this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
-        this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
-      },
-      search (args) {
-        this.startDate = this.$refs.paged.$refs.cri.model.startDate
-        this.endDate = this.$refs.paged.$refs.cri.model.endDate
-        if (this.endDate == '' || this.startDate == '') {
-          return this.$showMessage("时间区间的开始和结束时间不能为空！")
-        }
-        if (this.orgCondtionStr){
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and uf.f_orgid in ${this.orgCondtionStr}`
+        if(this.$refs.paged.$refs.cri.model.f_user_type && this.$refs.paged.$refs.cri.model.f_user_type.length>0){
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
         }
-        else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and uf.f_orgid = '${this.orgCondtionStr}'`
-        if(this.zonesdata){
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
-        }
-        console.log('args.condition',args.condition)
-        console.log('this.condition',this.condition)
-        this.condition = this.condition.replace(/f_zones/, "a.f_slice_area")
-        args.condition = this.condition
-        this.model.search(args.condition, args.model)
-      },
-      // getRes (obj) {
-      //   this.orgCondtionStr = plugins.convertToIn(obj)
-      // }
-      getRes (obj) {
-        this.orgCondtionStr = plugins.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(\'' + this.$login.f.orgid + '\')'
-        if(obj.indexOf("f_zones = ")>0){
-          this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
-        }else{
-          this.zonesdata=''
-        }
-      },
-      pricetypechanged(){
-        this.$refs.paged.$refs.cri.model.f_price_id = []
-      },
-      // getRes(condition,obj) {
-      //   this.orgCondtionStr = condition
-      //   this.orgname = obj.orgnames[0]
-      //   this.depname = obj.depnames[0]
-      // }
+        // this.gasproperties.push({label: '全部', value: ''})
+      }
+      else{
+        this.gasproperties =[{label: '全部', value: ''}]
+      }
     },
-    computed: {
-      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;
-        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
-        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          let rs = []
-          let priceArr = []
-          if ( pricetype.length >0) {
-            let params = {
-              f_price_type: pricetype[0],
-              filter: this.f_filialeid,
-              prices: this.prices
-            }
-            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
-              let temp = {}
-              temp.label = item.label
-              temp.value = item.value.f_price_id
-              priceArr.push(temp)
-            })
-            rs = [{label: '全部', value: ''}, ...priceArr]
-          }
-          if (rs.length === 0) {
-            console.log('rs读出来是空')
-            this.$refs.paged.$refs.cri.model.f_price_id = ''
+    hidden(){
+      this.criteriaShow = !this.criteriaShow
+    },
+    // 查询开关
+    seachchange () {
+      this.searchshow = !this.searchshow
+    },
+
+    // 显示柱状图
+    showEcharts () {
+      this.echarts = !this.echarts
+      console.log(this.echarts)
+    },
+    close () {
+      this.show = false
+    },
+    // SaveAsFile(str) {
+    //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
+    //     if (res === 'confirm') {
+    //       let style = '<style>' +
+    //         'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;}  .tdcenter{text-align: center;}</style>';
+    //       let strHtml = style + document.getElementById(str).innerHTML;
+    //       console.log(strHtml);
+    //       let LODOP = getLodop();
+    //       LODOP.PRINT_INIT('');
+    //       LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
+    //       LODOP.SAVE_TO_FILE('抄表统计.xls')
+    //     }
+    //   })
+    // },
+    clearmsg () {
+      this.$refs.paged.$refs.cri.model = {}
+      this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-6).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+    },
+    search (args) {
+      this.startDate = this.$refs.paged.$refs.cri.model.startDate
+      this.endDate = this.$refs.paged.$refs.cri.model.endDate
+      if (this.endDate == '' || this.startDate == '') {
+        return this.$showMessage("时间区间的开始和结束时间不能为空！")
+      }
+      if (this.orgCondtionStr){
+        this.condition = this.$refs.paged.$refs.cri.condition + ` and uf.f_orgid in ${this.orgCondtionStr}`
+      }
+      else
+        this.condition = this.$refs.paged.$refs.cri.condition + ` and uf.f_orgid = '${this.orgCondtionStr}'`
+      if(this.zonesdata){
+        this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
+      }
+      console.log('args.condition',args.condition)
+      console.log('this.condition',this.condition)
+      this.condition = this.condition.replace(/f_zones/, "a.f_slice_area")
+      args.condition = this.condition
+      this.model.search(args.condition, args.model)
+    },
+    // getRes (obj) {
+    //   this.orgCondtionStr = plugins.convertToIn(obj)
+    // }
+    getRes (obj) {
+      this.orgCondtionStr = plugins.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(\'' + this.$login.f.orgid + '\')'
+      if(obj.indexOf("f_zones = ")>0){
+        this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
+      }else{
+        this.zonesdata=''
+      }
+    },
+    pricetypechanged(){
+      this.$refs.paged.$refs.cri.model.f_price_id = []
+    },
+    // getRes(condition,obj) {
+    //   this.orgCondtionStr = condition
+    //   this.orgname = obj.orgnames[0]
+    //   this.depname = obj.depnames[0]
+    // }
+  },
+  computed: {
+    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;
+      let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+      console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+      if(this.$refs.paged.$refs.cri.model !==null) {
+        let rs = []
+        let priceArr = []
+        if ( pricetype.length >0) {
+          let params = {
+            f_price_type: pricetype[0],
+            filter: this.f_filialeid,
+            prices: this.prices
           }
-          return rs
-        }
-      },
-      pricetypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      },
-      houseTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
-      },
-      positions() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
-      },
-      getCondition() {
-        var con=""
-        if (this.orgCondtionStr) {
-          con= `${this.$refs.paged.$refs.cri.condition} and u.f_orgid in  ${this.orgCondtionStr}`
-        }
-        else{
-          con= `${this.$refs.paged.$refs.cri.condition} `
+          this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+            let temp = {}
+            temp.label = item.label
+            temp.value = item.value.f_price_id
+            priceArr.push(temp)
+          })
+          rs = [{label: '全部', value: ''}, ...priceArr]
         }
-        return {
-          condition: this.condition,
-          startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
-          endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+        if (rs.length === 0) {
+          console.log('rs读出来是空')
+          this.$refs.paged.$refs.cri.model.f_price_id = ''
         }
-
-      },
-      usertypes () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      // usertypes () {
-      //   return this.$getParams('用户类型', [{label: '全部', value: ''}])
-      // },
-      f_outlets () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('网点查询用')]
-      },
-      valveStatus () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-      Getuserstyle () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+        return rs
       }
+    },
+    pricetypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+    },
+    houseTypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
+    },
+    positions() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
+    },
+    getCondition() {
+      var con=""
+      if (this.orgCondtionStr) {
+        con= `${this.$refs.paged.$refs.cri.condition} and u.f_orgid in  ${this.orgCondtionStr}`
+      }
+      else{
+        con= `${this.$refs.paged.$refs.cri.condition} `
+      }
+      return {
+        condition: this.condition,
+        startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
+        endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+      }
+
+    },
+    usertypes () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    // usertypes () {
+    //   return this.$getParams('用户类型', [{label: '全部', value: ''}])
+    // },
+    f_outlets () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('网点查询用')]
+    },
+    valveStatus () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+    },
+    Getuserstyle () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
     }
   }
+}
 </script>
 <style>
-  .mystyle{
-    margin-left:80px;
-  }
-  .datapanel {
-    color: #333;
-    background-color: white;
-    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
-    padding: 10px 10px 10px 10px;
-    border-radius:15px;
-  }
+.mystyle{
+  margin-left:80px;
+}
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+  padding: 10px 10px 10px 10px;
+  border-radius:15px;
+}
 </style>