manage-client 3.2.7 → 3.2.8-aode

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

@@ -7,69 +7,55 @@
             <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 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">客户名称</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>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
-                           condition="f_user_phone like '%{}%'" placeholder="客户电话">
-                  </div>
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+
                   <div class="span" style="float:right;">
-                    <button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
-                    <read-card v-if="!$filialeInfo || $filialeInfo!=='rongcheng'" :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn"  v-ref:readcard></read-card>
                     <button class="button_search button_spacing" @click="search()">查询</button>
                     <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                     <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
-                    <export-excel :data="$parent.$parent.getCondition"
+                    <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                   :field="$parent.$parent.getExportField"
-                                  :footer="$parent.$parent.footer"
-                                  :header="$parent.$parent.other"
-                                  v-if="$parent.$parent.authArr.includes('档案查询导出')"
                                   sqlurl="rs/logic/exportfile" sql-name="meterQuery" template-name='表具查询导出'
                                   :choose-col="true"></export-excel>
-                    <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model" :field="$parent.$parent.getExportField"
-                                 :defaultfield="$parent.$parent.defaultfield"
-                                titletable="客户查询"
-                                :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">
-                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
+                    <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">
+                    <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">
+                    <label class="font_normal_body">客户电话</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                           condition="f_user_phone like '%{}%'" placeholder="客户电话">
+                  </div>
+                  <div class="col-sm-2">
                     <label class="font_normal_body">客户地址</label>
                     <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" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">
-                    <label class="font_normal_body">用气点</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_userfiles_address"
-                           condition="f_userfiles_address like '%{}%'" placeholder='用气点'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;号</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">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body">卡&nbsp;&nbsp;&nbsp;&nbsp;号</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                            condition="f_card_id like '%{}%'" placeholder='卡号'>
                   </div>
 
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
                     <label class="font_normal_body">客户类型</label>
                     <v-select :value.sync="model.f_user_type"
                               :options='$parent.$parent.usertypes'
@@ -78,28 +64,14 @@
                               condition="f_user_type = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group" >
-                    <label for="f_usetype" class="font_normal_body">二次挂表</label>
-                    <v-select :value.sync="model.issecondtype" v-model="model.issecondtype"
-                              condition="f_usetype {}"
-                              :options='$parent.$parent.issecond' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label for="f_usetype" class="font_normal_body"  title="参数:使用类型">使用类型</label>
-                    <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
-                              condition="f_usetype = '{}'"
-                              :options='$parent.$parent.usetype' placeholder='请选择'
-                              close-on-select></v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
                     <label class="font_normal_body">用气性质</label>
                     <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
                               :options='$parent.$parent.gasproperties' placeholder='请选择'
                               condition="f_gasproperties = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
                     <label class="font_normal_body">气价类型</label>
                     <v-select :value.sync="model.pricetype" v-model="model.pricetype"
                               placeholder='气价类型' :options="$parent.$parent.pricetypes"
@@ -107,7 +79,7 @@
                               close-on-select v-ref:type>
                     </v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
                     <label class="font_normal_body">气价名称</label>
                     <v-select :value.sync="model.f_price_name"
                               v-model="model.f_price_name"
@@ -116,7 +88,7 @@
                               condition="f_price_name = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
                     <label class="font_normal_body">气表分类</label>
                     <v-select :value.sync="model.f_meter_classify"
                               v-model="model.f_meter_classify"
@@ -124,7 +96,7 @@
                               condition="f_meter_classify = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
+                  <div class="col-sm-2">
                     <label class="font_normal_body">气表品牌</label>
                     <v-select :value.sync="model.f_meter_brand"
                               v-model="model.f_meter_brand"
@@ -132,32 +104,21 @@
                               condition="f_meter_brand = '{}'"
                               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_meter_style"
-                              v-model="model.f_meter_style"
-                              :options='$parent.$parent.meterstyle[model.f_meter_brand]' placeholder='请选择'
-                              condition="f_meter_style = '{}'"
-                              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_table_state"
-                              v-model="model.f_table_state"
-                              :options='$parent.$parent.tablestate' placeholder='请选择'
-                              condition="f_table_state = '{}'"
+                  <div class="col-sm-2">
+                    <label class="font_normal_body">气表品牌</label>
+                    <v-select :value.sync="model.f_meter_brand"
+                              v-model="model.f_meter_brand"
+                              :options='$parent.$parent.meterbrands' placeholder='请选择'
+                              condition="f_meter_brand = '{}'"
                               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_usestate"
-                              v-model="model.f_usestate"
-                              :options='$parent.$parent.usestate' placeholder='请选择'
-                              condition="f_usestate = '{}'"
-                              close-on-select></v-select>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body">气表型号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_style"
+                           condition="f_meter_style like '%{}%'" placeholder='气表型号'>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label for="startDate" class="font_normal_body">建表日期</label>
+                  <div class="col-sm-2">
+                    <label for="startDate" class="font_normal_body">开始日期</label>
                     <datepicker id="startDate" placeholder="开始日期" style="width:60%"
                                 v-model="model.startDate"
                                 :value.sync="model.startDate"
@@ -166,8 +127,8 @@
                                 condition="f_input_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label for="endDate" class="font_normal_body">建表日期</label>
+                  <div class="col-sm-2">
+                    <label for="endDate" class="font_normal_body">结束日期</label>
                     <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                                 v-model="model.endDate"
                                 :value.sync="model.endDate"
@@ -176,67 +137,13 @@
                                 condition="f_input_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
-                  <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.startTQDate"
-                                :value.sync="model.startTQDate"
-                                :format="'yyyy-MM-dd'"
-                                :show-reset-button="true"
-                                condition="f_gas_date >= '{} 00:00:00'">
-                    </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.endTQDate"
-                                :value.sync="model.endTQDate"
-                                :format="'yyyy-MM-dd'"
-                                :show-reset-button="true"
-                                condition="f_gas_date <= '{} 23:59:59'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;壁挂炉</label>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body">壁&nbsp;&nbsp;挂炉</label>
                     <v-select :value.sync="model.isbgl" v-model="model.isbgl"
                               :options='$parent.$parent.bgl' placeholder='请选择'
                               condition="isbgl = '{}'"
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group" v-if="!$filialeInfo || $filialeInfo!=='rongcheng'">
-                    <label class="font_normal_body">用户等级</label>
-                    <v-select :value.sync="model.f_user_grade"
-                              v-model="model.f_user_grade"
-                              :options='$parent.$parent.usergrade' placeholder='请选择'
-                              condition="f_user_grade = '{}'"
-                              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_book_slice_area" v-model="model.f_book_slice_area"
-                              :options='$parent.$parent.bookSlice' placeholder='片区/表册'
-                              style="width:60%"
-                              close-on-select
-                              condition="f_book_slice_area = '{}'"></v-select>
-                  </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.inputtores' placeholder='请选择'
-                              condition="f_inputtor = '{}'"
-                              close-on-select :value-single="true" :search="false">
-                    </v-select>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-                    <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
-                              :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                              style="width:60%"
-                              close-on-select
-                              condition="f_meter_book_num = '{}'"></v-select>
-                  </div>
 
                 </div>
               </div>
@@ -260,18 +167,12 @@
                   <th>
                     <nobr>客户地址</nobr>
                   </th>
-                  <th>
-                    <nobr>表册片区</nobr>
-                  </th>
                   <th>
                     <nobr>表上余额</nobr>
                   </th>
                   <th>
                     <nobr>客户类型</nobr>
                   </th>
-                  <th>
-                    <nobr>使用类型</nobr>
-                  </th>
                   <th>
                     <nobr>用气性质</nobr>
                   </th>
@@ -295,9 +196,6 @@
                   <th>
                     <nobr>气表型号</nobr>
                   </th>
-                  <th>
-                    <nobr>户管员</nobr>
-                  </th>
                   <th>
                     <nobr>通气人</nobr>
                   </th>
@@ -316,76 +214,69 @@
                 </tr>
               </template>
               <template partial='body'>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;"><nobr>
+                <td style="text-align: center;"><nobr>
                   <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
                 </nobr> </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_user_name}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.idnumber}}</nobr>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_idnumber}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_book_slice_area}}</nobr>
-                </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_balance_amount}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_user_type}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_usetype}}</nobr>
-                </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_gasproperties}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_meternumber}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_card_id}}</nobr>
                 </td>
 
 
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_price_name}}</nobr>
                 </td>
-                <th :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <th>
                   <nobr>{{row.value}}</nobr>
                 </th>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_meter_brand}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_meter_style}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
-                  <nobr>{{row.f_inputtor}}</nobr>
-                </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_gas_person}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_gas_date}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_input_date}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.f_table_state}}</nobr>
                 </td>
-                <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                <td style="text-align: center;">
                   <nobr>{{row.isbgl}}</nobr>
                 </td>
+
               </template>
               <template partial='foot'>
+
               </template>
             </data-grid>
           </criteria-paged>
@@ -396,9 +287,12 @@
                 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_balance_amount}}
               </td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+                客户余额合计&emsp;{{sumsmodel.f_balance}}
+              </td>
             </tr>
           </table>
 
@@ -429,65 +323,31 @@
           <!--</footer>-->
           <!--</modal>-->
         </div>
-        <div class="flex" v-if="show">
-          <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+        <div v-if="show">
+          <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
         </div>
       </div>
     </div>
   </div>
-  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
 </template>
 
 <script>
   import {PagedList} from 'vue-client'
   import exportConfig from '../config/exportConfig'
-  let cardBtnGen = async function (self, val) {
-    self.cardInfo = val.data
-
-    // 判断读卡是否需要卡密码
-    console.log('读卡上的信息', self.cardInfo)
-
-    if (self.cardInfo.NewParam) {
-      if (self.cardInfo.NewParam.error) {
-        if (self.cardInfo.NewParam.error === '0001') {
-          // 需要重新读卡并传卡密码
-          if (self.model.rows.length == 1 && self.model.rows[0].f_alias === self.cardInfo.Factory) {
-            self.readCardParam = self.model.rows[0].f_card_password
-            self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(self.model.rows[0].f_card_password)
-          } else {
-            self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
-            return
-          }
-        }
-      }
-    }
-    self.card=self.cardInfo.CardID
-    self.search()
-  }
 
   let readySomething = async function (self) {
-    self.$MagGetSaleParam.initinputtor();
-    self.getinputtores();
-    self.initmeterbook();
     // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     // await self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
     self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
   }
 
   export default {
-    title: '表具查询',
     data() {
       return {
-        IdCardInfo:'',
-        card:'',
-        isSingleUser: null,
-        other:[],
-        footer:[],
-        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0}),
+        model: new PagedList('rs/sql/meterQuery', 20, {}, {f_balance_amount: 0, f_balance_gas: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
 
@@ -505,99 +365,29 @@
         show:false,
         rowdata:{},
         meterbrands: [],
-        // 气表型号
-        meterstyle: {},
-        //默认打印列
-        defaultfield: [],
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone']
-        },
         pricenames: [],
         gasproperties:[],
-        inputtouPerson: [],
-        meterbooks:[{label: '全部',value: ''}],  //抄表册
-        inputtores:[{label: '全部',value: ''}],
         prices: [],
         //合计数据
         sumsmodel: {},
-        //表册片区
-        bookSlice:[{label: '全部',value: ''}],
-        inputtores:[{label: '全部',value: ''}],  //抄表员
         f_filialeid: this.$login.f.f_orgid,
-        allorgid:[],
-        tempfalg :false,
-        lastorgstr:'',
-        issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
-        usetype:this.$appdata.getParam('使用类型')
+        selectfields:[],
+        usertypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
+        metertypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
+        pricetypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       }
     },
     ready() {
-      console.log("===========",this.$filialeInfo)
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      ReadIDCard(){
-        this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
-          console.log('======',msg)
-          if(msg.err !== 0){ return}
-          this.IdCardInfo=msg.strID
-        })
-        console.log(this.IdCardInfo)
-        if(this.IdCardInfo) {
-          this.search()
-        }else{
-          alert("读取失败，找不到用户信息")
-        }
-      },
-      cardBtn (val) {
-        // this.clear()
-        cardBtnGen(this, val)
-      },
-      async initmeterbook(orgstr){
-        if(orgstr == null ){
-          orgstr = this.f_filialeid;
-        }
-        //获取新的抄表册,先去清理所有的抄表册
-        this.$GetSaleParam.meterbooks = [];
-        //开始加载新的抄表册
-        await this.$LoadParams.loadMeterBook(orgstr)
-        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-      },
-      async getinputtores () {
-        // 获取抄表员
-        let rs = []
-        if (this.$login.f.f_gasman.length > 0) {
-          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-            let temp = {
-              label: this.$login.f.f_gasman[i].name,
-              value: this.$login.f.f_gasman[i].name
-            }
-            rs.push(temp)
-          }
-        }
-        this.inputtores = [{label: '全部', value: ''}, ...rs]
-      },
-      getotherfooter () {
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
-        this.other = [];
-        this.footer = [];
-        let exportdata = this.getCondition;
-        let otherInData = [];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        let footerData = [], exportfield = this.getExportField;
-        footerData.push("合计");
-        let self = this;
-        for (var field in self.sumsmodel) {
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
@@ -609,44 +399,25 @@
         this.show=true
       },
       selfSearch(args) {
-        //抄表员查询条件
-        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,``)
-          console.log("=====抄表员model22222222222绑定====",str)
-          //查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
-        if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
+        if (!this.orgCondtionStr){
+          args.condition = `${args.condition}` + ' and f_filialeid = ' + this.$login.f.orgid
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        if(this.card!=''){
-          args.condition +=` and f_card_id='${this.card}'`
-        }
-        if(this.IdCardInfo!=''){
-          args.condition+=` and f_idnumber='${this.IdCardInfo}'`
-        }
         this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-        this.card=''
-        this.IdCardInfo=''
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
       clear() {
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
       },
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      async getRes(condition) {
+      getRes(condition) {
         this.orgCondtionStr = condition
-
+        this.orgCondtionStr = this.orgCondtionStr.replace('f_orgid', 'f_filialeid')
       },
       stamp() {
         this.all = false
@@ -692,12 +463,6 @@
           temp.label = item.label
           temp.value = item.value.f_meter_brand
           brandArr.push(temp)
-          // 取出对应气表型号
-          let styleArr = []
-          for (let row of item.value.gasmodel) {
-            styleArr.push({label: row.label,value: row.value.f_meter_style})
-          }
-          this.meterstyle[temp.value] = styleArr
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
         //初始化气表价格
@@ -716,36 +481,10 @@
       },
       async updateParams() {
         await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: "全部", value: ""})
-        this.initSlice(this.f_filialeid)
-        if(this.allorgid!=null){
-          this.allorgid.forEach((res)=>{
-            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
-          })
-        }
-      },
-      async initSlice (val) {
-        if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
-          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          this.bookSlice = []
-          console.log('过滤之后的片区-------------------', arr)
-          arr.forEach((res) => {
-            this.bookSlice.push({label: res.name, value: res.name})
-          })
-        }
+        this.initParams()
       },
     },
     watch: {
-      'model.rows.length' () {
-        this.isSingleUser = this.model.rows
-      },
       'all'(val) {
         if (val) {
           this.modelval = this.bodyData
@@ -754,58 +493,30 @@
           this.put()
         }
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      },
       '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));
-        }
+      'orgCondtionStr'(val) {
         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: {
-      authArr () {
-        return this.$login.r ? this.$login.r : []
-      },
       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) {
+          if (f_user_type.length > 0 && f_gasproperties.length > 0 && pricetype.length >0) {
             let params = {
+              f_user_type: f_user_type[0],
+              f_gasproperties: f_gasproperties[0],
               f_price_type: pricetype[0],
               filter: this.f_filialeid,
               prices: this.prices
@@ -870,49 +581,13 @@
         }
         return [{label: '全部', value: ''}, ...rs]
       },
-      usertypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      // gasproperties() {
-      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      // },
 
-      metertypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-      // meterbrands() {
-      //   let arr = []
-      //   this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-      //     let temp = {}
-      //     temp.label = item.label
-      //     temp.value = item.value.f_meter_brand
-      //     arr.push(temp)
-      //   })
-      //   return [{label: '全部', value: ''}, ...arr]
-      // },
-      pricetypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      },
       tablestate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+        return [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}]
       },
       bgl(){
         return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
-      },
-      usergrade(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
-      },
-      usestate(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用状态')]
       }
     }
   }
 </script>
-<style>
-  .back-red{		/* 红色背景 */
-    background-color: #F6C6CE;
-  }
-  .back-blue{		/* 蓝色背景 */
-
-  }
-</style>