manage-client 3.2.30 → 3.2.31-aode

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -1,11 +1,40 @@
 <template>
-  <div id="unit" class="flex-row"  >
-    <div class="basic-main"  @keyup.enter="search" >
-      <div class="flex"  :class="{showbottom:showbottomsum}" v-if="!show">
+  <div id="unit" class="flex-row" class="foot_tabset"  @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">
+                <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="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="changeMeterQuery" template-name='换表查询导出'
+                                :choose-col="true"></export-excel>
+
+                  <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">客户名称</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>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -26,40 +55,21 @@
                               condition="f_operate_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>
                 <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="客户名称">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
                 </div>
-
-<!--
-        -->
-
-
-                <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="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
-
-                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="changeMeterQuery" template-name='换表查询导出'
-                                :choose-col="true">
-                  </export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :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 class="col-sm-2 form-group">
+                  <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>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <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>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
@@ -68,30 +78,22 @@
                 <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_address"
-                         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_user_type"
-                            v-model="model.f_user_type"
-                            :options='$parent.$parent.userTypes' placeholder='请选择'
-                            condition="f_user_type = '{}'"
-                            close-on-select></v-select>
+                         condition="CONTAINS(f_address,'{}')" placeholder='客户地址'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">新表品牌</label>
-                  <v-select :value.sync="model.f_meter_brand"
-                            v-model="model.f_meter_brand"
+                  <v-select :value.sync="model.f_new_meter_brand"
+                            v-model="model.f_new_meter_brand"
                             :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand = '{}'"
+                            condition="f_new_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_brand_old"
-                            v-model="model.f_meter_brand_old"
+                  <v-select :value.sync="model.f_old_meter_brand"
+                            v-model="model.f_old_meter_brand"
                             :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand_old = '{}'"
+                            condition="f_old_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -111,9 +113,14 @@
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <label class="font_normal_body">新表卡号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_newcard_id"
+                         condition="f_newcard_id = '{}'" 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_card_id"
-                         condition="f_card_id = '{}'" placeholder='卡号'>
+                         condition="f_card_id = '{}'" placeholder='旧表卡号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">换表状态</label>
@@ -124,53 +131,17 @@
                             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_type_old"
-                            v-model="model.f_meter_type_old"
-                            :options='$parent.$parent.meterClassify' placeholder='请选择'
-                            condition="f_meter_type_old = '{}'"
+                  <label class="font_normal_body">是否煤改气</label>
+                  <v-select :value.sync="model.f_ismgq"
+                            v-model="model.f_ismgq"
+                            :options='$parent.$parent.mgqoptions' placeholder='请选择'
+                            condition="f_ismgq = '{}'"
                             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_type"
-                            v-model="model.f_meter_type"
-                            :options='$parent.$parent.meterClassify' placeholder='请选择'
-                            condition="f_meter_type = '{}'"
-                            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_changemeter_fee"
-                            v-model="model.f_changemeter_fee"
-                            :options='$parent.$parent.changemeter_fee' placeholder='请选择'
-                            condition="f_changemeter_fee {}"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">付款方式</label>
-                  <v-select id="f_payment"
-                            v-model="model.f_payment"
-                            placeholder='请选择'
-                            condition="f_payment ='{}'"
-                            :value.sync="model.f_payment"
-                            :options='$parent.$parent.payments'
-                            close-on-select clear-button>
-                  </v-select>
-                </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 = '{}'" placeholder='表号'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表&ensp;封&ensp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
-                         condition="f_metertitles = '{}'" placeholder='表封号'>
-                </div>
               </div>
             </div>
           </criteria>
+
           <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
             <template partial='head'>
               <tr>
@@ -181,10 +152,16 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>付款方式</nobr>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
+                  <nobr>客户电话</nobr>
+                </th>
+                <th>
+                  <nobr>用户类型</nobr>
+                </th>
+                <th>
+                  <nobr>用气性质</nobr>
                 </th>
                 <th>
                   <nobr>换表类型</nobr>
@@ -199,7 +176,10 @@
                   <nobr>新表号</nobr>
                 </th>
                 <th>
-                  <nobr>表封号</nobr>
+                  <nobr>旧流量计表号</nobr>
+                </th>
+                <th>
+                  <nobr>新流量计表号</nobr>
                 </th>
                 <th>
                   <nobr>旧气表品牌</nobr>
@@ -207,6 +187,15 @@
                 <th>
                   <nobr>新气表品牌</nobr>
                 </th>
+                <th>
+                  <nobr>旧表初始底数</nobr>
+                </th>
+                <th>
+                  <nobr>旧表读数</nobr>
+                </th>
+                <th>
+                  <nobr>新表初始底数</nobr>
+                </th>
                 <th>
                   <nobr>补气量</nobr>
                 </th>
@@ -214,7 +203,7 @@
                   <nobr>补气金额</nobr>
                 </th>
                 <th>
-                  <nobr>订单编号</nobr>
+                  <nobr>换表时是否收费</nobr>
                 </th>
                 <th>
                   <nobr>备注</nobr>
@@ -228,6 +217,9 @@
                 <th>
                   <nobr>换表日期</nobr>
                 </th>
+                <th>
+                  <nobr>是否煤改气</nobr>
+                </th>
                 <th>
                   <nobr>人员</nobr>
                 </th>
@@ -237,10 +229,9 @@
                 <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>
             <template partial='body'>
@@ -251,12 +242,17 @@
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_payment}}</nobr>
+                <nobr>{{row.f_address}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_address}}</nobr>
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
               </td>
-
               <td style="text-align: center;">
                 <nobr>{{row.f_type}}</nobr>
               </td>
@@ -270,7 +266,10 @@
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_metertitles}}</nobr>
+                <nobr>{{row.f_flowmeternumber_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_flowmeternumber}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand_old}}</nobr>
@@ -278,6 +277,16 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_initial_base_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_using_base_old}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_initial_base_new}}</nobr>
+              </td>
+
               <td style="text-align: center;">
                 <nobr>{{row.f_remanent_gas}}</nobr>
               </td>
@@ -285,7 +294,7 @@
                 <nobr>{{row.f_remanent_money}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_serial_number}}</nobr>
+                <nobr>{{row.f_whether_pay}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
@@ -299,6 +308,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_ismgq}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operator}}</nobr>
               </td>
@@ -309,39 +321,23 @@
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_meter_type_old}}</nobr>
+                <button class="btn btn-link" @click.stop="$parent.$parent.$parent.getImg(row)">查看附件</button>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
-              <td style="text-align: center;"><nobr>
-                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
-              </nobr></td>
             </template>
             <template partial='foot'></template>
           </data-grid>
+
         </criteria-paged>
+
         <table class="table-hover">
           <tr style="position: relative" class="table-bordered">
             <td
               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_changemeter_fee}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              补气量合计:&emsp;{{sumsmodel.f_remanent_gas}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              补气金额合计:&emsp;{{sumsmodel.f_remanent_money}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
-            </td>
           </tr>
         </table>
         <!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
@@ -372,19 +368,37 @@
         <!--</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>
-    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-      <article slot="modal-body">
-        <upload  :blodid="selected.id" v-ref:upload isremark="false" fusetype="换表&清零"></upload>
+    <modal :show.sync="showImg" width="80vw;"
+           title="查看附件" v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="showImg=false"><span>&times;</span></button>
+      </header>
+      <article slot="modal-body" class="modal-body" style="height:80vh ;">
+        <div v-for="file in imgs" class="col-sm-4" style="border: 2px solid #f6f6f6">
+          <div style="height:180px;">
+            <img style="height:100%" :src="file.f_downloadURL"/>
+          </div>
+          <div  class="auto">
+            <div class="showtext">上传时间:&nbsp;<span>{{file.f_uploaddate}}</span></div>
+            <div class="showtext">操作员:&nbsp;<span>{{file.f_username}}</span></div>
+            <div class="showtext">分类:&nbsp;<span>{{file.fusetype}}</span></div>
+            <div class="showtext">文件说明:&nbsp;{{file.fremarks}}</div>
+            <div class="flex-row showtext">
+              <a   target="_blank" :href="file.f_downloadURL">预览</a>
+            </div>
+          </div>
+        </div>
       </article>
-      <footer slot="modal-footer" class="modal-footer">
+      <footer slot="modal-footer" style="display: none">
       </footer>
     </modal>
   </div>
 </template>
+
 <script>
   import {PagedList} from 'vue-client'
   import defaultPrint from '../config/DefaultPrint'
@@ -392,27 +406,24 @@
 
   let readySomething = async function (self) {
 
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    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.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
     self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-
-    props:['data'],
-    title: '换表查询',
     data() {
       return {
+        selectfields:[],
+        gasproperties:[],
+        showImg:false,
         data: {},
-        other:[],
-        footer:[],
+        imgs:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0,f_remanent_money:0,f_remanent_gas:0,hushu:0}),
+        model: new PagedList('rs/sql/changeMeterQuery', 20, {}, {f_changemeter_fee: 0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
@@ -424,43 +435,63 @@
           dep:[],
           user:[],
         },
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
-        },
         show:false,
         rowdata:{},
-        showupload:false,
-        selected:{},
         thead: '',
         tfoot: '',
-        defaultfield: [],
+
         // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
 
+
         //合计数据
         sumsmodel: {},
-        changemeter_fee:[
-          {label: '全部', value: ''},
-          {label: '销售', value: '> 0'},
-          {label: '免费', value: '= 0'}
-        ]
+        mgqoptions: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
       }
-
     },
+    props:['selectorg'],
     ready() {
-      debugger
-      console.log(this.$parent.startDate)
-      console.log(this.$parent.$parent.startDate)
-      console.log(this.$parent.$parent.$parent.startDate)
-      this.startDate=this.$parent.startDate
-      this.endDate=this.$parent.endDate
-      console.log("this",this)
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
+
       readySomething(this)
+      for(var item in exportConfig.changemeterConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      view(row){
-        this.showupload = true
-        this.selected= row
-        console.log("11",row)
+      getImg(row){
+        let data= {
+          condition: `f_blobid= '${row.f_userinfo_id}' and datediff(day,'${row.f_operate_date}',f_uploaddate)=0  and fusetype like '换表&清零' order by f_uploaddate desc `,
+          tablename: "t_files"
+        }
+        this.$resetpost('rs/sql/singleTable',{data:data}).then((res)=> {
+          this.imgs = []
+          if(res.data.length>0){
+            for(let j = 0; j<res.data.length;j++){
+            let temp = res.data[j].f_downloadpath
+            let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+            res.data[j].f_downloadURL = "http://" + location.host + "/" + URL
+            this.imgs.push(res.data[j])
+          }
+          this.showImg  = true
+        }else {
+          }
+        })
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.model.model !==null) {
+          this.$refs.paged.model.model.f_gasproperties=''
+
+          console.log(this.$refs.paged.model.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.model.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
       },
       search(){
         this.$refs.paged.$refs.cri.search()
@@ -472,23 +503,6 @@
         this.rowdata=obj
         this.show=true
       },
-      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.getfield;
-        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);
-      },
       async initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -501,16 +515,10 @@
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
 
       },
-     async selfSearch(args) {
-        if (this.data) {
-          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
-        }
+      selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
-        await this.model.search(args.condition, args.model)
+        this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
-
       },
       clear() {
         //清空部门和人员
@@ -519,7 +527,7 @@
         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[key] = ''
         })
       },
       show() {
@@ -528,9 +536,9 @@
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      getRes(obj) {
-        console.log(obj,"========")
-        this.orgCondtionStr = obj
+      getRes(condition,obj) {
+        console.log(condition,"========")
+        this.orgCondtionStr = condition
       },
       stamp() {
         this.all = false
@@ -587,17 +595,18 @@
       'modelval.length'() {
         this.put()
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+        }
       }
     },
     computed: {
-      // getstart(){
-      //   return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
-      // },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
@@ -607,26 +616,12 @@
       changeTypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表类型')]
       },
-      userTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      meterClassify() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
       changePerson() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('换表人')]
       },
       charge_state() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      },
-      payments() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
       }
     }
   }
 </script>
-<style scoped>
-.showbottom{
-  height:95%
-}
-</style>