manage-client 3.2.83-2 → 3.2.83-aode

package/src/{filiale/aode/HandplanQuery.vue → components/webmeter/NewWebmeterHandplanQuery.vue}

@@ -1,132 +1,115 @@
 <template>
   <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
+<!--    <div class="basic-main" @keyup.enter="search">-->
+    <div class="basic-main">
       <div class="flex" v-if="!show">
-
         <criteria-paged :model="model" v-ref:paged>
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' 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 for="startDate" class="font_normal_body">开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_input_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_input_date <= '{}'">
-                  </datepicker>
-                </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_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
-                </div>
-
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <button class="button_clear button_spacing" @click="clear()">清空</button>
 
-
-                  <export-excel :data="$parent.$parent.getCondition"
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="handplanQuery" template-name='抄表查询导出'
+                                sqlurl="rs/logic/exportfile" sql-name="webmeterhandplanQuery" template-name='抄表查询导出'
                                 :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="抄表查询打印"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-
                   <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">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber like '%{}%'" placeholder='表号'>
+                </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_name"
                          condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户地址</label>
+                  <label class="font_normal_body">地&emsp;&emsp;址</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                         condition="f_address like '%{}%'" placeholder='地址'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄表状态</label>
-                  <v-select :value.sync="model.f_meter_state"
-                            v-model="model.f_meter_state"
-                            :options='$parent.$parent.meterstate' placeholder='请选择'
-                            condition="f_meter_state = '{}'"
-                            close-on-select></v-select>
+                  <label for="inputStartDate" class="font_normal_body">结算日期</label>
+                  <datepicker id="inputStartDate" placeholder="结算日期" style="width:60%"
+                              v-model="model.inputStartDate"
+                              :value.sync="model.inputStartDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_input_date >= '{}'">
+                  </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表单状态</label>
-                  <v-select :value.sync="model.f_hand_state"
-                            v-model="model.f_hand_state"
-                            :options='$parent.$parent.handstate' placeholder='请选择'
-                            condition="f_hand_state = '{}'"
-                            close-on-select></v-select>
+                  <label for="inputEndDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>
+                  <datepicker id="inputEndDate" placeholder="结算日期" style="width:60%"
+                              v-model="model.inputEndDate"
+                              :value.sync="model.inputEndDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_input_date <= '{}'">
+                  </datepicker>
                 </div>
+
+
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
-                  <v-select :value.sync="model.f_inputtor"
-                            v-model="model.f_inputtor"
-                            :options='$parent.$parent.inputtor' placeholder='请选择'
-                            multiple = "true"
-                            close-on-select></v-select>
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :options='$parent.$parent.usertypes'
+                            @change="$parent.$parent.userTypeChange"
+                            :value.sync="model.f_user_type"
+                            close-on-select condition="f_user_type = '{}'"
+                            placeholder='用户类型'
+                            style="width: 60%"  v-model="model.f_user_type"></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">是否缴费</label>
-                  <v-select :value.sync="model.f_whether_pay"
-                            v-model="model.f_whether_pay"
-                            :options='$parent.$parent.whetherPay' placeholder='请选择'
-                            condition="f_whether_pay = '{}'"
-                            close-on-select></v-select>
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select :options='$parent.$parent.gasproperties'
+                            :value.sync="model.f_gasproperties"
+                            close-on-select
+                            condition="f_gasproperties = '{}'"
+                            placeholder='用气性质'
+                            style="width: 60%"
+                            v-model="model.f_gasproperties">
+                  </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <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"
-                            condition="f_user_type = '{}'"
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand" multiple
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand in {}"
                             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_accounts_state"
-                            :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_accounts_state"
-                            condition="f_accounts_state = '{}'"
-                            close-on-select></v-select>
+                  <label for="handStartDate" class="font_normal_body">用气日期</label>
+                  <datepicker id="handStartDate" placeholder="用气日期" style="width:60%"
+                              v-model="model.handStartDate"
+                              :value.sync="model.handStartDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_hand_date >= '{}'">
+                  </datepicker>
                 </div>
-                <!--<div class="col-sm-2 form-group">
-                  <label class="font_normal_body">是否缴费</label>
-                  <v-select :value.sync="model.f_whether_pay"
-                            :options='$parent.$parent.accountsState' placeholder='请选择' v-model="model.f_whether_pay"
-                            condition="f_whether_pay = '{}'"
-                            close-on-select></v-select>
-                </div>-->
-                <res-select-group :initres="$parent.$parent.initres"  @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 :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            enter-push
-                            multiple = "true"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            close-on-select>
-
-                  </v-select>
+                  <label for="handEndDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="handEndDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.handEndDate"
+                              :value.sync="model.handEndDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_hand_date <= '{}'">
+                  </datepicker>
                 </div>
               </div>
             </div>
@@ -148,34 +131,31 @@
                   <nobr>表号</nobr>
                 </th>
                 <th>
-                  <nobr>上期底数</nobr>
-                </th>
-                <th>
-                  <nobr>本期底数</nobr>
+                  <nobr>气表品牌</nobr>
                 </th>
                 <th>
-                  <nobr>用气量</nobr>
+                  <nobr>电话号码</nobr>
                 </th>
                 <th>
-                  <nobr>用气金额</nobr>
+                  <nobr>身份证号</nobr>
                 </th>
                 <th>
-                  <nobr>已交金额</nobr>
+                  <nobr>客户类型</nobr>
                 </th>
                 <th>
-                  <nobr>下账状态</nobr>
+                  <nobr>用气性质</nobr>
                 </th>
                 <th>
-                  <nobr>收费时间</nobr>
+                  <nobr>上期底数</nobr>
                 </th>
                 <th>
-                  <nobr>下发日期</nobr>
+                  <nobr>本期底数</nobr>
                 </th>
                 <th>
-                  <nobr>所属年月</nobr>
+                  <nobr>用气量</nobr>
                 </th>
                 <th>
-                  <nobr>录入日期</nobr>
+                  <nobr>用气金额</nobr>
                 </th>
                 <th>
                   <nobr>一阶气量</nobr>
@@ -205,27 +185,29 @@
                   <nobr>三阶气费</nobr>
                 </th>
                 <th>
-                  <nobr>抄表员</nobr>
+                  <nobr>本期余额</nobr>
                 </th>
                 <th>
-                  <nobr>是否缴费</nobr>
+                  <nobr>上期结余</nobr>
                 </th>
-
                 <th>
-                  <nobr>抄表状态</nobr>
+                  <nobr>结算日期</nobr>
                 </th>
                 <th>
-                  <nobr>状态</nobr>
+                  <nobr>用气日期</nobr>
                 </th>
                 <th>
-                  <nobr>人员</nobr>
+                  <nobr>抄表状态</nobr>
                 </th>
                 <th>
-                  <nobr>部门</nobr>
+                  <nobr>状态</nobr>
                 </th>
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body'>
@@ -242,35 +224,32 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_last_tablebase}}</nobr>
+              <td style="text-align: center">
+                <nobr>{{row.f_meter_brand}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_tablebase}}</nobr>
+                <nobr>{{row.userphone}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtamount}}</nobr>
+                <nobr>{{row.f_idnumber}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee}}</nobr>
+                <nobr>{{row.f_user_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_debt_money}}</nobr>
+                <nobr>{{row.f_gasproperties}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_accounts_state}}</nobr>
+                <nobr>{{row.f_last_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
+                <nobr>{{row.f_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_hand_date}}</nobr>
-              </td>
-              <td>
-                <nobr>{{row.f_rest_date}}</nobr>
+                <nobr>{{row.f_oughtamount}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_input_date}}</nobr>
+                <nobr>{{row.f_oughtfee}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_stair1amount}}</nobr>
@@ -300,21 +279,24 @@
                 <nobr>{{row.f_stair3fee}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_inputtor}}</nobr>
+                <nobr>{{row.f_balance}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_whether_pay}}</nobr>
+                <nobr>{{row.f_curbalance}}</nobr>
               </td>
-
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_state}}</nobr>
+                <nobr>{{row.f_input_date}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_hand_state}}</nobr>
+                <nobr>{{row.f_hand_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_state}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
+                <nobr>{{row.f_hand_state}}</nobr>
               </td>
+
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
@@ -332,63 +314,59 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               用气量合计:&emsp;{{sumsmodel.f_oughtamount}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               气费合计:&emsp;{{sumsmodel.f_oughtfee}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               一阶气量合计:&emsp;{{sumsmodel.f_stair1amount}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               二阶气量合计:&emsp;{{sumsmodel.f_stair2amount}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               三阶气量合计:&emsp;{{sumsmodel.f_stair3amount}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               剩余气量合计:&emsp;{{sumsmodel.f_surplus_gas}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               扣减气量合计:&emsp;{{sumsmodel.f_haircut_gas}}
             </td>
           </tr>
         </table>
       </div>
-      <modal :show.sync="batchmoneyShow" width="500px" title="反盘导入" v-ref:modal large backdrop="false">
-        <article slot="modal-body" class="modal-body">
-          <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
       <div v-if="show">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import {PagedList, HttpResetClass} from 'vue-client'
-  import defaultPrint from './DefaultPrint'
-  import exportConfig from './exportConfig'
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../sale/config/DefaultPrint'
+  import exportConfig from '../sale/config/exportConfig'
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    self.$MagGetSaleParam.initinputtor();
+    // self.getinputtores();
+    self.initmeterbook();
+    self.$refs.paged.$refs.cri.model.inputStartDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.inputEndDate = self.$login.toStandardDateString() + ' 23:59:59'
     // await self.$refs.paged.$refs.cri.search()
-    await self.$getConfig(self, 'HandplanQuery')
+    await self.$getConfig(self, 'webmeterhandplanQuery')
     console.log('抄表查询获取默认配置', self.config)
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     console.log('开始初始化参数', self.defaultfield)
@@ -399,10 +377,17 @@
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
+    name:'webmeter-handplan-query',
+    title: '物联网抄表查询',
     data() {
       return {
+        selectfields:[],
         data: {},
-        model: new PagedList('rs/sql/handplanQuery', 20, {}, {
+        model: new PagedList('rs/ckh/singleTableParam', 20, {
+          items: `"*"`,
+          tablename: `"t_cbcx"`,
+          condition: `"1=1 and " + this.condition`
+        }, {
           f_oughtamount: 0,
           f_oughtfee: 0,
           f_stair1amount: 0,
@@ -422,10 +407,8 @@
         show:false,
         rowdata:{},
         criteriaShow: false,
-        residentialArea: [],
         orgCondtionStr: '',
         modelval: [],
-        inputtouPerson: [],
         printshow: false,
         all: false,
         fields: {},
@@ -433,43 +416,46 @@
         tfoot: '',
 
         // 下拉框
-
+        //用气性质
+        gasproperties:[],
         //合计数据
         sumsmodel: {},
-        defaultfield: [],
+        // defaultfield: [],
         config: {
           defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber']
         },
-        batchmoneyShow:false
+        tempfalg :false,
+        lastorgstr:'',
+        allorgid:[],
+        meterbrands:[{label: '全部',value: ''}],
       }
     },
+    // props:['selectorg'],
+    props:[],
     ready() {
-      this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.webmeterHandplanFiles){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      async  getaddress(){
-        console.log('开始获取小区')
-        let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
-          data: {
-            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
-          }
-        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
-        console.log('小区',data)
-        let house = [{label: '全部', value: ''}]
-        for (let row of data.data){
-          console.log('开始保存小区')
-          house.push({label: row.f_residential_area, value: row.f_residential_area})
+      async initmeterbook(orgstr){
+        if(orgstr == null ){
+          orgstr = this.f_filialeid;
         }
-        this.residentialArea = house
+        //获取新的抄表册,先去清理所有的抄表册
+        // this.$GetSaleParam.meterbooks = [];
+        //开始加载新的抄表册
+        await this.$LoadParams.loadMeterBook(orgstr)
+        // this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
       },
-      Fileinput(){
-        this.batchmoneyShow=true;
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
       },
       search(){
         this.$refs.paged.$refs.cri.search()
@@ -477,27 +463,48 @@
       cancel() {
         this.show = false
       },
-      selfSearch(args) {
-        this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
-        if(this.area.length !== 0){
-          let str = JSON.stringify(this.area)
-          str = str.replace(/"/g,`'`)
-          str = str.replace(/\[/g,``)
-          str = str.replace(/\]/g,``)
-          //查询多个小区时条件
-          args.condition += ` and f_residential_area in  ( ${str} )`
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气价
+        let result = []
+        this.$MagGetSaleParam.prices.forEach((item) => {
+          if (item.f_state === '有效' && this.$login.f.orgid == item.f_filialeid) {
+            let value = {
+              label: item.f_price_name,
+              value: item.f_price_name
+            }
+            result.push(value)
+          }
+        })
+        let hash = {}
+        result = result.reduce((item, next) => {
+          hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+          return item
+        }, [])
+        this.prices = Array.from(new Set(result))
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+
+          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.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if(this.inputtouPerson.length !== 0){
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g,`'`)
-          str = str.replace(/\[/g,``)
-          str = str.replace(/\]/g,``)
-          //查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
         }
-
+      },
+      selfSearch(args) {
         args.condition = `${args.condition} ` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -508,9 +515,8 @@
         //部门和人员变为全选
         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] = []
-        })
+          this.$refs.paged.$refs.cri.model=[]
+        // })
       },
       show() {
         this.criteriaShow = true
@@ -521,28 +527,6 @@
       getRes(obj) {
         this.orgCondtionStr = obj
       },
-      stamp() {
-        this.all = false
-        //默认选择要打印的列
-        this.modelval = defaultPrint.config
-        this.fields = this.getfield
-        console.log('所有打印字段', this.fields)
-        this.printshow = true
-        this.put()
-      },
-      put() {
-        // 对Modelval进行排序
-        this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>收费查询统计报表</th></tr><tr>`
-        for (let key of this.modelval) {
-          this.thead += '<th>' + this.fields[key] + '</th>'
-        }
-        this.thead += '</tr>'
-      },
-      print() {
-        this.$refs.print.PrintAsFile()
-        this.printshow = false
-      },
       dealmsg(val) {
         console.log('---------------dealmsg')
         this.rowdata=val
@@ -578,55 +562,44 @@
       'modelval.length'() {
         this.put()
       },
+      async 'orgCondtionStr'(val) {
+        // this.meterbooks = [{label: '全部',value: ''}];
+        if(this.lastorgstr != val){
+          this.tempfalg = true;
+          this.lastorgstr = val;
+        }
+        if(this.tempfalg && val != null && val!=''  && val.indexOf("(")>-1){
+          this.tempfalg = false;
+          let a = val.substring(val.indexOf("(")+2)
+          await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
+        }
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          if(res.input !=null){
+            let resorgid = res.input.substring(res.input.indexOf("'"));
+            if(resorgid!= null && resorgid!=''){
+              resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
+              // resorgid = resorgid.replaceAll("'","");
+              resorgid = resorgid.replace(/'/g,"");
+              this.allorgid = resorgid.split(",")
+            }
+          }
+          this.updateParams()
+        }
+      },
     },
     computed: {
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.handplanConfig
-      },
-      getBankfield(){
-        return exportConfig.batchBankConfig
+        return exportConfig.webmeterHandplanFiles
       },
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      accountsState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('下账状态')]
-      },
-      meterstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
-      },
-      handstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
-      },
-      inputtor() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
-      },
-      whetherPay() {
-        return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
-      }
-    },
-    events:{
-      'onFileUpload': function (file, res) {
-        if (this.batchmoneyShow) {
-          let param = {
-            filepath: res.f_downloadpath,
-            f_operator: this.$login.f.name,
-            f_operatorid: this.$login.f.id,
-            f_orgid: this.$login.f.orgid,
-            f_orgname: this.$login.f.orgs,
-            f_depid: this.$login.f.depids,
-            f_depname: this.$login.f.deps
-          }
-          let http = new HttpResetClass();
-          http.load('POST', 'rs/logic/SumSettleFileImport', {data: param}, {
-            resolveMsg: null,
-            rejectMsg: '上传失败'
-          });
-        }
-      }
     }
   }
 </script>